Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

2 天以前 8b531e76e1f957d67069aa7ab0e8c5a9a747c06e

 src/views/equipmentManagement/measurementEquipment/components/formDia.vue

@@ -27,7 +27,7 @@
            </el-row>
            <el-row :gutter="30">
               <el-col :span="12">
                  <el-form-item label="安装位置：" prop="installationLocation">
                  <el-form-item label="安装位置：" prop="instationLocation">
                     <el-input
                        v-model="form.installationLocation"
                        placeholder="请输入"