Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_pro_山西_晋和园

gongchunyi

3 天以前 19f2e3bdbe04e7ea79c6a0bdc8c7318d4837b189

 src/views/safeProduction/dangerInvestigation/index.vue

@@ -160,7 +160,7 @@
            <el-form-item label="隐患编号："
                          prop="hiddenCode">
              <el-input v-model="form.hiddenCode"
                        placeholder="自动生成"
                        placeholder="保存后自动生成"
                        disabled
                        clearable />
            </el-form-item>