From 2c2994b7a998a9b324d96e4a6e19a42b35db88f8 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 02 十一月 2022 15:18:44 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 17 ++++++++++++++++-
1 files changed, 16 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 8da1ee3..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;
/**
@@ -257,6 +257,21 @@
@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