Merge remote-tracking branch 'origin/master'

zhaowei

6 天以前 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946

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

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