From 38596b03540250dd7de85c49f53ece5dd6bfe5b7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 13:19:14 +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 | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 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 42d30ea..35bc824 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
@@ -41,7 +41,8 @@
* 用户id
*/
@ApiModelProperty("用户id")
- private Long userId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private String userId;
/**
@@ -59,7 +60,7 @@
/**
* 用户类型（1系统后台用户 2导办人员用户）
*/
- @ApiModelProperty("用户类型（1系统后台用户 2导办人员用户）")
+ @ApiModelProperty("用户类型（1系统后台用户 2导办人员用户 3.部门领导 4.普通用户（小程序用户））")
private String userType;
@@ -230,7 +231,47 @@
@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;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办理事项名称")
+ private String mattersNames;
+
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("办结事项数目")
+ private String transactionEndNum;
}
--
Gitblit v1.7.1