From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/entity/Allocation.java | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/Allocation.java b/screen-api/src/main/java/com/moral/api/entity/Allocation.java
index 7a23920..b803c16 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Allocation.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Allocation.java
@@ -1,6 +1,7 @@
package com.moral.api.entity;
+import com.moral.api.pojo.bean.BaseInvalidEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -13,7 +14,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
-public class Allocation extends Model<Allocation> {
+public class Allocation extends BaseInvalidEntity<Allocation> {
private static final long serialVersionUID = 1L;
@@ -32,7 +33,7 @@
/**
* ������or������
*/
- private String escalationType;
+ private Integer escalationType;
/**
* ������������
@@ -129,31 +130,25 @@
/**
* ������ 0 ������ 1 ������ 2������ 3 ������ 4 ������
*/
- private String state;
- /**
- * ������������
- */
- private String isDel;
- /**
- * ������������
- */
- private String isInvalid;
+ private Integer state;
/**
* ������������
*/
private String invalidReason;
-
- private Integer createId;
-
- private String createName;
-
- private Date createTime;
-
- private Integer updateId;
-
- private String updateName;
-
- private Date updateTime;
+ /**
+ * ������������������
+ */
+ private Integer keyPoint;
+ private String latitude;
+ private String longitude;
+ /**
+ * ���������������
+ */
+ private String address;
+ /**
+ * ������������
+ */
+ private String name;
}
--
Gitblit v1.8.0