From 5e2ebcceae4bc34b46370f2c10110cd72e7f4fba Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 22 八月 2024 10:59:29 +0800
Subject: [PATCH] 修改权限相关
---
zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
index a143ca1..2fab50c 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
@@ -2,27 +2,43 @@
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excels;
+import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import lombok.Data;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
@Data
-public class sysUserAndUserInfo {
+public class sysUserAndUserInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
private Long userId;
+ @Excel(name = "鎵嬫満鍙风爜")
+ private String phonenumber;
+
+
+
+ /** 鐢ㄦ埛澶村儚 */
+ private String avatar;
+
+ /** 瀵嗙爜 */
+ private String password;
+
+ /** 鐢ㄦ埛鏄电О */
+ @Excel(name = "鐢ㄦ埛鏄电О")
+ private String nickName;
+
+
/** 鐢ㄦ埛鏄电О */
@Excel(name = "鐢ㄦ埛鍚嶇О")
- private String nickName;
-
-
+ private String userName;
/** 鐢ㄦ埛鎬у埆 */
@Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
@@ -52,7 +68,11 @@
private Long spouseId;
- private Long familyId;
+ private Long fid;
+ private Long mid;
private Long sysId;
+
+
+ private Integer clanId;
}
--
Gitblit v1.9.1