From e384609b41fe6434de81cfbb1663a501ad9fbc75 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 04 Jun 2021 11:05:55 +0800
Subject: [PATCH] 站点判断数字型字段为空时，变为null；站点、因子查询更改为按照更新时间排序；菜单判断url，是否已存在
---
screen-manage/src/main/java/com/moral/api/entity/ManageRole.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 c2ef650..8aefd79 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,10 +1,14 @@
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;
import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,7 +22,10 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class ManageRole extends Model<ManageRole> {
+
+
private static final long serialVersionUID = 1L;
@@ -31,17 +38,17 @@
/**
* ���������
*/
- private String roleName;
+ private String name;
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
@@ -51,6 +58,7 @@
/**
* ������������
*/
+ @TableField("`desc`")
private String desc;
--
Gitblit v1.8.0