Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/mixins/tableColumnsMixin.js

@@ -62,7 +62,8 @@ export default {
       let sList = list.filter((d, i, r) => {
         return d[key];
       });
-      let devColumns = this.newColumns?.length > 0 || this.columns;
+      let devColumns =
+        this.newColumns?.length > 0 ? this.newColumns : this.columns;
       let dList = devColumns.filter((d, i, r) => {
         return d[key] && d[key] !== '序号';
       });