From 2e0bf4423c235802791012e1fb0817d2c9156b2a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 30 Aug 2023 09:28:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/entity/Organization.java | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/Organization.java b/screen-api/src/main/java/com/moral/api/entity/Organization.java
index d204a71..cbc3b98 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Organization.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Organization.java
@@ -125,9 +125,4 @@
private String isDelete;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
}
--
Gitblit v1.8.0