From f16e5b84d8b15202acf505b5e80a9f2ebcc471fe Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 12 十月 2022 18:35:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java
index 1639421..51bae5a 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/MenuEntity.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -14,6 +15,7 @@
 
 @ApiModel("菜单实体类")
 @Data
+@TableName("automessage_menu")
 public class MenuEntity implements Serializable
 {
 
@@ -51,6 +53,7 @@
      * 父节点id
      */
     @ApiModelProperty("父节点id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
 
 }

--
Gitblit v1.7.1