From a901d8910243b6c15c3ff7722d006e06d87ec6f6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Aug 2023 15:58:50 +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/Menu.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/entity/Menu.java b/screen-manage/src/main/java/com/moral/api/entity/Menu.java
index 9d6164f..1131ef8 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Menu.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Menu.java
@@ -4,11 +4,11 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+
 import java.util.Date;
 import java.util.List;
 
+import com.moral.anno.FieldName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -35,26 +35,31 @@
     /**
      * ���������
      */
+    @FieldName("������������")
     private String name;
 
     /**
      * url������
      */
+    @FieldName("url")
     private String url;
 
     /**
      * ������������
      */
+    @FieldName("������url")
     private String icon;
 
     /**
      * ���������
      */
+    @FieldName("���������id")
     private Integer parentId;
 
     /**
      * ���������������������������
      */
+    @FieldName("������������")
     @TableField(value="`order`")
     private Integer order;
 
@@ -76,10 +81,5 @@
     @TableField(exist = false)
     private List<Menu> children;
 
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
 
 }

--
Gitblit v1.8.0