From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/entity/ManageAccountRole.java | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageAccountRole.java b/screen-api/src/main/java/com/moral/api/entity/ManageAccountRole.java
index c3add8c..996eed7 100644
--- a/screen-api/src/main/java/com/moral/api/entity/ManageAccountRole.java
+++ b/screen-api/src/main/java/com/moral/api/entity/ManageAccountRole.java
@@ -55,9 +55,5 @@
private String isDelete;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0