From ecf5a776601f9c30ae48f3ce0f0422ec6ffcb9f6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 07 Sep 2023 15:47:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/entity/Group.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/Group.java b/screen-api/src/main/java/com/moral/api/entity/Group.java
index dc0d63e..0a9dc8e 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Group.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Group.java
@@ -22,7 +22,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@TableName("`groupMenu`")
+@TableName("`group`")
public class Group extends Model<Group> {
private static final long serialVersionUID = 1L;
@@ -61,9 +61,5 @@
private String isDelete;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0