From 4686da41b376617f6d447b3546c045ce54f032fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 16:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-manage/src/main/java/com/moral/api/entity/ManageRole.java |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java b/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java
index 8aefd79..557244f 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageRole.java
@@ -62,9 +62,4 @@
     private String desc;
 
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
 }

--
Gitblit v1.8.0