Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/views/factoryModel/station/index.vue

@@ -143,7 +143,14 @@
             label: '设备名称',
             prop: 'extInfo.assetName',
             formatter: (_row, _column, cellValue) => {
-              return typeof cellValue === 'string' ? cellValue :'';
+              return typeof cellValue === 'string' ? cellValue : '';
+            }
+          },
+          {
+            label: '设备编码',
+            prop: 'extInfo.assetCode',
+            formatter: (_row, _column, cellValue) => {
+              return typeof cellValue === 'string' ? cellValue : '';
             }
           },
           {