From 947d016e4bd349b78d540e3a869f55d68b2c610c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 08 十一月 2022 18:16:18 +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 | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..7f82428 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;
/**
@@ -260,4 +260,18 @@
@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