# Conflicts: # gassafetyprogress-web/src/views/regulation/device/index.vue # gassafetyprogress-web/src/views/regulation/gasuser/index.vue