From 32cc13189371ee1e367897a64fbc22f90b53add8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 19 Jun 2024 16:24:26 +0800
Subject: [PATCH] fix:尘负荷排序接口提交
---
screen-api/src/main/java/com/moral/api/entity/Organization.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 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..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,13 @@
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.io.Serializable;
+import com.moral.api.pojo.vo.monitorPoint.MonitorPointVos;
+
import java.util.Date;
+import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,7 +18,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-06
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -50,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;
/**
* ������
@@ -114,10 +127,9 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
+ /**
+ * ������������
+ */
+ @TableField(exist = false)
+ private List<MonitorPointVos> monitorPoint;
}
--
Gitblit v1.8.0