Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-ui

src/views/work_record/work_plan/formModel.vue

@@ -11,7 +11,6 @@
     width="450px"
     :dialogAttrs="{ 'close-on-click-modal': false,'top':'8vh'}"
   />
-
 </template>
 
 <script>

src/views/work_record/work_record/index.vue

@@ -88,6 +88,7 @@
         :show-overflow-tooltip="true" />
       <el-table-column prop="fan_model_name" label="风机模型" align="center" v-if="showColumn.fan_model_name"
         :show-overflow-tooltip="true" />
+        
 
       <el-table-column prop="parts_name" label="所属部件" align="center" v-if="showColumn.parts_name"
         :show-overflow-tooltip="true" />