From 51c36e6f6b17862714fbd5c42da43386dc05d28a Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Fri, 09 Apr 2021 14:32:29 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev --- screen-api/src/main/java/com/moral/api/entity/Organization.java | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/entity/Organization.java b/screen-api/src/main/java/com/moral/api/entity/Organization.java index 6121b58..d204a71 100644 --- a/screen-api/src/main/java/com/moral/api/entity/Organization.java +++ b/screen-api/src/main/java/com/moral/api/entity/Organization.java @@ -15,7 +15,7 @@ * </p> * * @author moral - * @since 2021-03-09 + * @since 2021-04-06 */ @Data @EqualsAndHashCode(callSuper = false) @@ -50,29 +50,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