From 373c036205c6d8ac3871857da7b3c7a44e384086 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 30 Aug 2023 16:22:13 +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/ManageRole.java |   10 +++++-----
 1 files changed, 5 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 40d5bcf..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
@@ -1,6 +1,7 @@
 package com.moral.api.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
@@ -21,7 +22,10 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class ManageRole extends Model<ManageRole> {
+
+
 
     private static final long serialVersionUID = 1L;
 
@@ -54,12 +58,8 @@
     /**
      * ������������
      */
+    @TableField("`desc`")
     private String desc;
 
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
 
 }

--
Gitblit v1.8.0