merge fix

src/views/home/component/params/params1.vue

@@ -176,7 +176,7 @@
         </div>
         <div class='full-width '>
           <el-form-item label="主要建设内容及规模">
-            <el-input v-model="form.constructionContent" type='textarea' placeholder='主要建设内容及规模' :rows='4'/>
+            <el-input v-model="form.construction_content" type='textarea' placeholder='主要建设内容及规模' :rows='4'/>
           </el-form-item>
         </div>
       </el-form>