Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 b6b2c379bd92f076acd16801b1442604ea21fc5d

 src/views/tms/modules/baseTools/DncToolsSelectModal.vue

@@ -780,9 +780,9 @@
          dataIndex: 'toolModel'
        },
        {
          title: '备注',
          title: '工具简称',
          align: 'center',
          dataIndex: 'remark'
          dataIndex: 'aliasLabel'
        },
        {
          title: '操作',