Merge remote-tracking branch 'origin/master'

zhaowei

7 天以前 8d4c67323bee47d6225f150e9f61868c6434a358

 src/views/dnc/base/modules/TerminalIndex/EquipmentStartWork.vue

@@ -73,7 +73,7 @@
          {
            title: '用户编号',
            align: 'center',
            dataIndex: 'punchUser',
            dataIndex: 'punchUserUserName',
            width: 250
          },
          {