From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/entity/Organization.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/Organization.java b/screen-manage/src/main/java/com/moral/api/entity/Organization.java
index 3b12b20..a1eb06c 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Organization.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Organization.java
@@ -16,7 +16,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -51,29 +51,39 @@
private Integer provinceCode;
/**
+ * ������������
+ */
+ private String provinceName;
+
+ /**
* ������������
*/
private Integer cityCode;
/**
- * ���������
+ * ������������
+ */
+ private String cityName;
+
+ /**
+ * ���������
*/
private Integer areaCode;
/**
- * ���������
+ * ���������
*/
- private Long townCode;
+ private String areaName;
/**
- * ������������
+ * ���������������������
*/
- private Long villageCode;
+ private Integer locationLevelCode;
/**
- * ������������������ provincd_code city_code ......
+ * ������������������������
*/
- private String locationLevel;
+ private String locationLevelName;
/**
* ������
--
Gitblit v1.8.0