Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

src/views/safetyBook/hsggbsdj/dialog.edit.vue

@@ -108,7 +108,8 @@
           </el-form-item>
           <div>
             <el-form-item label="会议重点:" prop="content">
-              <Editor style="height: 150px" v-model="formData.content"></Editor>
+              <!-- <Editor style="height: 150px" v-model="formData.content"></Editor> -->
+              <el-input v-model="formData.content" type="textarea" :rows="3"></el-input>
             </el-form-item>
           </div>
         </el-form>