Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2023-12-26 ae3ad906ed4b09f72fc716957c4dbbe16341b38f

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

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