From 943a2364c76db4c4e570e0d0219a81b6caa9bffc Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 13 May 2021 14:27:08 +0800
Subject: [PATCH] deivce相关接口

---
 screen-api/src/main/java/com/moral/api/entity/Organization.java |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 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 2dd7686..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
@@ -3,8 +3,9 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 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 +15,7 @@
  * </p>
  *
  * @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -49,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;
 
     /**
      * ������
@@ -96,17 +107,17 @@
     /**
      * ������������
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * ������������
      */
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     /**
      * ������������
      */
-    private LocalDateTime expireTime;
+    private Date expireTime;
 
     /**
      * ������������

--
Gitblit v1.8.0