From 68e750bf109efb0469704e54e48a29649512358c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 18 Dec 2023 13:31:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/entity/ManageMenu.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java b/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java
index 492ebaa..bb180b6 100644
--- a/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java
+++ b/screen-api/src/main/java/com/moral/api/entity/ManageMenu.java
@@ -15,7 +15,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -69,10 +69,11 @@
*/
private String isDelete;
+ /**
+ * ������
+ */
+ private String desc;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+
}
--
Gitblit v1.8.0