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/ResponsibilityUnit.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/entity/ResponsibilityUnit.java b/screen-api/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
new file mode 100644
index 0000000..561bb84
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/entity/ResponsibilityUnit.java
@@ -0,0 +1,55 @@
+package com.moral.api.entity;
+
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+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;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ResponsibilityUnit extends Model<ResponsibilityUnit> {
+
+    //������������id
+    @TableId(value = "unit_id", type = IdType.AUTO)
+    private Integer unitId;
+
+    private String unitName;
+
+    private Integer areaCode;
+
+    private  Integer parentCode;
+    //0��������� 1���������
+    private  Integer state;
+    //0��������� 1���������
+    private  String isDel;
+    //0������������ 1������������
+    private  Integer isInvalid;
+
+    private String invalidReason;
+
+    private  Integer createId;
+
+    private  String createName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private  Date createTime;
+
+    private Integer updateId;
+
+    private String updateName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private String areaName;
+
+    @TableField(exist = false)
+    private String parentName;
+}

--
Gitblit v1.8.0