From 346288bc38bdab442721d7609caed86d03b9d2d4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 19:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/entity/Allocation.java | 140 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 140 insertions(+), 0 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
new file mode 100644
index 0000000..4124f6e
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/entity/Allocation.java
@@ -0,0 +1,140 @@
+package com.moral.api.entity;
+
+
+import com.moral.api.pojo.bean.BaseInvalidEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Allocation extends BaseInvalidEntity<Allocation> {
+
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ������id
+ */
+ @TableId(value = "allocation_id", type = IdType.AUTO)
+ private Integer allocationId;
+
+ /**
+ *������������
+ */
+ private String allocationNum;
+
+ /**
+ * ������or������
+ */
+ private Integer escalationType;
+
+ /**
+ * ������������
+ */
+ private Date escalationTime;
+
+ /**
+ * ������������
+ */
+ private String pollutePosition;
+
+ /**
+ * ������������id
+ */
+ private Integer unitId;
+
+ /**
+ * ������������id
+ */
+ private Integer polluteType;
+
+ /**
+ * ������������id
+ */
+ private Integer changeType;
+
+
+
+ /**
+ * ������������
+ */
+ private Integer changeDay;
+
+ /**
+ * ������������id
+ */
+ private Integer escalationUnitId;
+
+ /**
+ * ���������
+ */
+ private String escalationName;
+
+ /**
+ * ������������id
+ */
+ private Integer investigationType;
+
+ /**
+ * ������������
+ */
+ private String problemDescribe;
+
+ /**
+ * ������������
+ */
+ private Integer isChange;
+
+ /**
+ * ������������
+ */
+ private String changeDescribe;
+ /**
+ * ���������������
+ */
+ private String changeName;
+
+ /**
+ * ������������
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date changeTime;
+
+ /**
+ * ������������
+ */
+ private Integer checkScore;
+ /**
+ * ������������
+ */
+ private String checkDescribe;
+ /**
+ * ���������
+ */
+ private String checkName;
+
+
+
+ /**
+ * ������������
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date checkTime;
+ /**
+ * ������ 0 ������ 1 ������ 2������ 3 ������ 4 ������
+ */
+ private Integer state;
+ /**
+ * ������������
+ */
+ private String invalidReason;
+
+
+}
--
Gitblit v1.8.0