Merge remote-tracking branch 'origin/master'

zhaowei

6 天以前 6e4b54ef350de163e4101558889d043d437e793c

 src/views/mdc/base/modules/DepartList/DepartListContent/DepartList.vue

@@ -183,7 +183,7 @@
            }
          },{

            title: '设备编码',
            title: '统一编码',
            align: 'center',
            dataIndex: 'equipmentId',
          },