From bf3f62727f785ada196c576601eb2b9e5401b3cb Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Mon, 16 Oct 2023 20:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=94=A8=E6=88=B7=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84user=5Ftype=E7=99=BB=E5=BD=95=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=89=8D=E5=8F=B0=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/domain/SysUser.java    | 16 ++--------------
 ruoyi-ui/src/views/system/user/index.vue         | 12 +++++++++++-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
index 097545e..65cc201 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
@@ -43,7 +43,6 @@ public class SysUser extends BaseEntity
     private Long deptId;
 
     /** 部门对象 */
-    //@RelationManyToOne(selfField = "deptId", targetField = "deptId")
     private SysDept dept;
 
     /** 用户账号 */
@@ -53,7 +52,7 @@ public class SysUser extends BaseEntity
     private String nickName;
 
     /**
-        * 用户类型（sys_user系统用户）
+        * 用户登录设备类型（sys_user系统用户、app_user App用户）
     */
     private String userType;
 
@@ -84,24 +83,13 @@ public class SysUser extends BaseEntity
     /** 最后登录时间 */
     private Date loginDate;
 
-
-
     /** 角色对象 */
-//    @RelationManyToMany(
-//        selfField = "userId", targetField = "roleId",
-//        joinTable = "sys_user_role",
-//        joinSelfColumn = "user_id", joinTargetColumn = "role_id"
-//    )
     private List<SysRole> roles;
 
     /** 角色组 */
     private Long[] roleIds;
 
-//    @RelationManyToMany(
-//        selfField = "userId", targetField = "postId",
-//        joinTable = "sys_user_post",
-//        joinSelfColumn = "user_id", joinTargetColumn = "post_id"
-//    )
+
     private List<SysPost> postList;
 
     /** 岗位组 */
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index eff7ede..d1d14cb 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -293,12 +293,21 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="设备类型">
+              <el-select v-model="form.userType"  placeholder="请选择">
+                <el-option label="PC端"  value="sys_user"></el-option>
+                <el-option label="APP端"  value="app_user"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="备注">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -574,6 +583,7 @@ function reset() {
     email: undefined,
     gender: undefined,
     status: "0",
+    userType: "sys_user",
     remark: undefined,
     postIds: [],
     roleIds: []