Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-yms into dev

src/views/‌doorSecurity‌/entryExitRecords/index.vue → src/views/doorSecurity/entryExitRecords/index.vue

@@ -110,13 +110,27 @@
             align: 'center',
             showOverflowTooltip: true
           },
-        //   {
-        //     minWidth: 120,
-        //     prop: 'personName',
-        //     label: '人员姓名',
-        //     align: 'center',
-        //     showOverflowTooltip: true
-        //   },
+          {
+            minWidth: 120,
+            prop: 'personName',
+            label: '人员姓名',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'loginName',
+            label: '用户名',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            minWidth: 120,
+            prop: 'jobNumber',
+            label: '工号',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             minWidth: 110,
             prop: 'isAbnormal',