From e6854d2d97f55827a04c28a1dbee62a27b64ffa6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 28 May 2021 14:47:13 +0800
Subject: [PATCH] screen-manage               更改前台菜单回显逻辑

---
 screen-manage/src/main/java/com/moral/api/entity/Organization.java |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 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 2dd7686..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
@@ -5,6 +5,8 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,7 +16,7 @@
  * </p>
  *
  * @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -49,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;
 
     /**
      * ������
@@ -96,17 +108,17 @@
     /**
      * ������������
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * ������������
      */
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     /**
      * ������������
      */
-    private LocalDateTime expireTime;
+    private Date expireTime;
 
     /**
      * ������������

--
Gitblit v1.8.0