From 44251a92dc85a93eff59704b40b07830bde8d16f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 27 Jul 2023 15:38:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/entity/User.java | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/User.java b/screen-api/src/main/java/com/moral/api/entity/User.java
index cf22cd8..1ee5ef9 100644
--- a/screen-api/src/main/java/com/moral/api/entity/User.java
+++ b/screen-api/src/main/java/com/moral/api/entity/User.java
@@ -101,9 +101,4 @@
private String isDelete;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
}
--
Gitblit v1.8.0