From 2ab1de34b119570c99946ab3e480e9d31745518a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Jan 2022 17:28:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/entity/ManageRole.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageRole.java b/screen-api/src/main/java/com/moral/api/entity/ManageRole.java
index a5a5497..5a99da7 100644
--- a/screen-api/src/main/java/com/moral/api/entity/ManageRole.java
+++ b/screen-api/src/main/java/com/moral/api/entity/ManageRole.java
@@ -55,9 +55,6 @@
private String desc;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+
}
--
Gitblit v1.8.0