From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java b/screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
index e39e045..b2d467c 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
@@ -5,8 +5,11 @@
import lombok.EqualsAndHashCode;
import java.util.Date;
+import java.util.List;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -14,26 +17,38 @@
@EqualsAndHashCode(callSuper = false)
public class ResponsibilityUnit extends Model<ResponsibilityUnit> {
+
+ private static final long serialVersionUID = 1L;
+
//������������id
+ @TableId(value = "unit_id", type = IdType.AUTO)
private Integer unitId;
-
+ /**
+ * ������������
+ */
private String unitName;
-
+ /**
+ * ������������
+ */
private Integer areaCode;
-
+ /**
+ * ������������
+ */
private Integer parentCode;
-
- private Integer state;
-
+ //0��������� 1���������
+ private String state;
+ //0��������� 1���������
private String isDel;
-
+ //0������������ 1������������
private Integer isInvalid;
-
+ //������������
private String invalidReason;
+
+ private String value;
private Integer createId;
- private String create_name;
+ private String createName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
@@ -49,4 +64,7 @@
@TableField(exist = false)
private String parentName;
+
+ @TableField(exist = false)
+ private List<Object> parentCodeList;
}
--
Gitblit v1.8.0