Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfptweb-public...

shuishen

2021-07-16 9135b7afb074e1480e04afdee560ec7d38d66e07

 src/views/system/user.vue

@@ -310,12 +310,15 @@
              prop: "userTypeName",
              slot: true,
              display: false
            }, {
            }
            , {
              label: "在线状态",
              prop: "online_status",
              slot: true,
              hide: true,
              display: false
            },
            }
            ,
            {
              label: "工作状态",
              prop: "work_status",