Merge remote-tracking branch 'origin/master'

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

gassafetyprogress-web/src/views/regulation/gasuser/index.vue

@@ -354,6 +354,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改燃气用户";
+        this.devicePos = [response.data.longitude, response.data.latitude];
       });
     },
     /** 提交按钮 */