From 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 08:24:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/entity/OrganizationLayout.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/OrganizationLayout.java b/screen-manage/src/main/java/com/moral/api/entity/OrganizationLayout.java
index e58aab6..d93cf25 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/OrganizationLayout.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/OrganizationLayout.java
@@ -59,6 +59,11 @@
*/
private Date createTime;
+ /**
+ * ������������,0���������������1���������
+ */
+ private String isDelete;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.8.0