From 6344a8b6b7e2853dbfa9e6506ff2e17a31930297 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 10 Jul 2023 14:17:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/entity/ManageRole.java | 8 +++-----
1 files changed, 3 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 50bbedc..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
@@ -22,7 +22,10 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class ManageRole extends Model<ManageRole> {
+
+
private static final long serialVersionUID = 1L;
@@ -58,10 +61,5 @@
@TableField("`desc`")
private String desc;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0