From 7d98f48d82a5b2d0b4c42ea412fa160e41e3be9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 10:54:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 4690102..1a1eb79 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
@@ -42,7 +42,7 @@
*/
@ApiModelProperty("用户id")
@JsonSerialize(using = ToStringSerializer.class)
- private Long userId;
+ private String userId;
/**
@@ -60,7 +60,7 @@
/**
* 用户类型（1系统后台用户 2导办人员用户）
*/
- @ApiModelProperty("用户类型（1系统后台用户 2导办人员用户）")
+ @ApiModelProperty("用户类型（1系统后台用户 2导办人员用户 3.普通用户 4.小程序用户")
private String userType;
@@ -260,4 +260,22 @@
@ApiModelProperty("是否是部门领导（1是 2不是）")
private String isDivisionHead;
+ @ApiModelProperty("办理事项ids")
+ private String mattersIds;
+
+
+ @ApiModelProperty("部门ids")
+ private String departmentIds;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办理事项名称")
+ private String mattersNames;
+
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办结事项数目")
+ private String transactionEndNum;
+
}
--
Gitblit v1.7.1