From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014
---
flower_city/src/main/java/com/dg/core/db/gen/entity/AreaCode2022.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AreaCode2022.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AreaCode2022.java
index db06081..4482778 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/AreaCode2022.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AreaCode2022.java
@@ -1,11 +1,15 @@
package com.dg.core.db.gen.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
+import java.util.List;
/**
* <p>
@@ -15,7 +19,7 @@
* @author fengjin
* @since 2022-09-20
*/
-@TableName("area_code_2022")
+@TableName("automessage_area_code_2022")
@Data
@ApiModel("所属地区实体类")
public class AreaCode2022 implements Serializable {
@@ -26,6 +30,7 @@
* 区划代码
*/
@ApiModelProperty("区划代码")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long code;
/**
@@ -38,14 +43,21 @@
* 级别1-5,省市县镇村
*/
@ApiModelProperty("级别1-5,省市县镇村")
- private Boolean level;
+ private Integer level;
/**
* 父级区划代码
*/
@ApiModelProperty("父级区划代码")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long pcode;
+ /**
+ * 子节点
+ */
+ @TableField(exist = false)
+ @ApiModelProperty("子节点")
+ private List<AreaCode2022> child;
}
--
Gitblit v1.7.1