From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/entity/SysConfig.java | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/SysConfig.java b/screen-api/src/main/java/com/moral/api/entity/SysConfig.java
index 30d0e9d..49b4961 100644
--- a/screen-api/src/main/java/com/moral/api/entity/SysConfig.java
+++ b/screen-api/src/main/java/com/moral/api/entity/SysConfig.java
@@ -64,9 +64,4 @@
private String isDelete;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
-
}
--
Gitblit v1.8.0