From 29c9ada64cee7adf3399e92ee3a62f2b9ed338ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 10:19:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java | 56 +++++++++++++++++++++-----------------------------------
1 files changed, 21 insertions(+), 35 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java
index c395dd9..0e48e13 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java
@@ -8,43 +8,29 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
-/**
- * @author zhibing.pu
- * @Date 2024/8/8 11:55
- */
+import java.io.Serializable;
+import java.util.List;
+
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_region")
@ApiModel(value="Region对象", description="")
-public class Region {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 城市名称
- */
- @TableField("name")
- private String name;
- /**
- * 行政区划代码
- */
- @TableField("code")
- private String code;
- /**
- * 城市code
- */
- @TableField("citycode")
- private String citycode;
- /**
- * 父级ID
- */
- @TableField("parent_id")
- private Integer parentId;
- /**
- * 英文名称
- */
- @TableField("english")
- private String english;
+public class Region implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ private String name;
+
+ private String code;
+
+ private String citycode;
+
+ private Long parentId;
+
+ private String english;
+
+ @TableField(exist = false)
+ private List<Region> childs;
}
--
Gitblit v1.7.1