From 36a11d78a2517b523fcf6b6ec622f3f0767f553f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 11:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 11ea7f0..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,7 +17,11 @@
@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;
/**
* ������������
@@ -29,13 +36,15 @@
*/
private Integer parentCode;
//0��������� 1���������
- private Integer state;
+ private String state;
//0��������� 1���������
private String isDel;
- //0������������ 1������������
+ //0������������ 1������������
private Integer isInvalid;
//������������
private String invalidReason;
+
+ private String value;
private Integer createId;
@@ -55,4 +64,7 @@
@TableField(exist = false)
private String parentName;
+
+ @TableField(exist = false)
+ private List<Object> parentCodeList;
}
--
Gitblit v1.8.0