Merge branch 'develop'

qushaowei

2023-11-22 445cfc2c5cee3d8fc0f8f1ffae5b66d9c761e681

 src/views/mdc/base/modules/deviceManager/DeviceList.vue

@@ -93,7 +93,7 @@
        ],
        columns2: [
          {
            title: '设备编码',
            title: '统一编码',
            align: 'center',
            dataIndex: 'equipmentId'
          },