From ff0d6cc27326837e5797ece1aa1a2c1bf0a9930f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 13:21:50 +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 | 5 +++--
1 files changed, 3 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 8da1ee3..3c246b0 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,7 @@
@ApiModelProperty("创建人名称")
private String createName;
-
+ @ApiModelProperty("是否是部门领导（1是 2不是）")
+ private String isDivisionHead;
}
--
Gitblit v1.7.1