Merge remote-tracking branch 'origin/master' into dev

src/views/assets/workbench/eqpt/calculate/importInfo.vue

@@ -114,7 +114,7 @@
         height="100%"
         size="mini"
         :loading="loading"
-        :column-config="{ resizable: true }"
+        :column-config="{ resizable: true, maxFixedSize: 0 }"
         :edit-config="editConfig"
         :scroll-y="{ enabled: true, gt: 0 }"
       >