From 3271a0e7421aa7c55f475be8f24ad85b576108b8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 22 Sep 2023 16:17:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java b/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java
index 95b08b9..8fc4e21 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java
@@ -57,6 +57,7 @@
/**
* ���������������������������
*/
+ @TableField(value = "`order`")
private Integer order;
/**
@@ -75,14 +76,16 @@
private String isDelete;
/*
+ * ������
+ * */
+ @TableField(value = "`desc`")
+ private String desc;
+
+ /*
* ������������
* */
@TableField(exist = false)
private List<ManageMenu> children;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0