Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2023-12-13 6178db93d6204bc6f83c0634b1ae3be539cd1c9a

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

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