From 4da6ddeb728bb4649328aa652ffc1c56b0e81629 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 22 Apr 2024 11:42:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-api/src/main/java/com/moral/api/entity/Organization.java |   51 ++++++++++++++++++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 19 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..cbe07b6 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
@@ -1,10 +1,14 @@
 package com.moral.api.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.moral.api.pojo.vo.monitorPoint.MonitorPointVos;
+
+import java.util.Date;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,7 +18,7 @@
  * </p>
  *
  * @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -49,29 +53,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,27 +110,26 @@
     /**
      * ������������
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * ������������
      */
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     /**
      * ������������
      */
-    private LocalDateTime expireTime;
+    private Date expireTime;
 
     /**
      * ������������
      */
     private String isDelete;
 
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
+    /**
+     * ������������
+     */
+    @TableField(exist = false)
+    private List<MonitorPointVos> monitorPoint;
 }

--
Gitblit v1.8.0