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

liuyg

2021-05-09 6582b5dd37e5779cc2eead7337e4b2cd7319a36d

 src/views/system/user.vue

@@ -279,10 +279,11 @@
              display: false
            },
            {
              label: "所属租户",
              label: "所属客户",
              prop: "tenantName",
              slot: true,
              display: false
              display: false,
              width:200
            },
            {
              label: "用户姓名",
@@ -300,7 +301,8 @@
              label: "所属部门",
              prop: "deptName",
              slot: true,
              display: false
              display: false,
              width:260
            },

            {
@@ -348,7 +350,7 @@
              icon: 'el-icon-user-solid',
              column: [
                {
                  label: "所属租户",
                  label: "所属客户",
                  prop: "tenantId",
                  type: "tree",
                  dicUrl: "/api/blade-system/tenant/select",