From 12c8caec0265ffff1c595bcab71b66201d3fbd21 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 21 十月 2022 15:44: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 |    3 +--
 1 files changed, 1 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 61e89a1..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,8 +42,7 @@
      */
     @ApiModelProperty("用户id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @JsonFormat(shape =JsonFormat.Shape.STRING )
-    private Long userId;
+    private String userId;
 
 
     /**

--
Gitblit v1.7.1