From e8242c8c4b69a52bd49fd0b5b49333e1d227e405 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 22 Sep 2023 16:45:52 +0800
Subject: [PATCH] Merge branch 'cjl' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/entity/ResponsibilityUnit.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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..11ea7f0 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
@@ -16,24 +16,30 @@
//������������id
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 create_name;
+ private String createName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
--
Gitblit v1.8.0