Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

Administrator

2021-04-02 e78c2fa41193782137051dcaf61a0ada926ce6b7

 src/views/system/user.vue

@@ -315,6 +315,13 @@
              display: false
            },
            {
              label: "工作状态",
              prop: "work_status",
              slot: true,
              hide: true,
              display: false
            },
            {
              label: "用户平台",
              type: "select",
              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",