From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
index cbf346c..54f3e05 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
@@ -29,12 +29,20 @@
private static final long serialVersionUID = 1L;
/**
- * 用户ID
+ * 主键id
*/
@ApiModelProperty("主键id")
@JsonSerialize(using = ToStringSerializer.class)
- @TableId(value = "user_id", type = IdType.AUTO)
- private Long userId;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty("用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private String userId;
/**
@@ -52,7 +60,7 @@
/**
* 用户类型（1系统后台用户 2导办人员用户）
*/
- @ApiModelProperty("用户类型（1系统后台用户 2导办人员用户）")
+ @ApiModelProperty("用户类型（1系统后台用户 2导办人员用户 3.普通用户 4.小程序用户")
private String userType;
@@ -63,9 +71,9 @@
private String phonenumber;
/**
- * 用户性别（0男 1女 2未知）
+ * 性别 1 男 2 女
*/
- @ApiModelProperty("用户性别（0男 1女 2未知）")
+ @ApiModelProperty("性别 1 男 2 女")
private String sex;
/**
@@ -156,6 +164,12 @@
@ApiModelProperty("角色id")
private String roleIds;
+ /**
+ * 前端使用
+ */
+ @ApiModelProperty("前端使用")
+ private String departmentIdStr;
+
/**
* 数据权限
*/
@@ -223,7 +237,55 @@
@ApiModelProperty("办结事项名称")
private String transactionNames;
+ /**
+ * 微信小程序id
+ */
+ @ApiModelProperty("微信小程序id")
+ private String openid;
+
+ /**
+ * 待处理办事指南数量
+ */
+ @ApiModelProperty("待处理办事指南数量")
+ private Integer transactionNum;
+ @TableField(exist = false)
+ @ApiModelProperty("权限资格")
+ private String permission;
+
+ @TableField(exist = false)
+ @ApiModelProperty("角色名称")
+ private String roleName;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("创建人名称")
+ private String createName;
+
+ @ApiModelProperty("是否是部门领导（1是 2不是）")
+ private String isDivisionHead;
+
+ @ApiModelProperty("办理事项ids")
+ private String mattersIds;
+
+
+ @ApiModelProperty("部门ids")
+ private String departmentIds;
+
+
+ @ApiModelProperty("多部门ids")
+ private String moreDepartmentIds;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办理事项名称")
+ private String mattersNames;
+
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办结事项数目")
+ private String transactionEndNum;
}
--
Gitblit v1.7.1