From 781f5c68b8c3388811d74f19c6b469e90d11d727 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 07 十一月 2022 13:50:41 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java
index 42078a9..bcd42fa 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java
@@ -34,7 +34,7 @@
     @ApiModelProperty(name = "userId", value = "主键用户id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableId(value = "user_id", type = IdType.AUTO)
-    private Long userId;
+    private String userId;
 
     /**
      * 登录账户

--
Gitblit v1.7.1