Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 b6b2c379bd92f076acd16801b1442604ea21fc5d

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

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