From 2c5d1693c3ec548abcf8c55bc4c4851884661e8e Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 21 Jul 2020 17:39:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java
index 8fac4c9..c6ee2ea 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java
@@ -1,12 +1,16 @@
package com.kidgrow.usercenter.model;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -28,7 +32,8 @@
/**
* 父ID
*/
- @NotEmpty(message = "父ID不能为空")
+ @NotNull(message = "父ID不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
/**
* 菜单名称
@@ -54,22 +59,22 @@
/**
* 排序
*/
- @NotEmpty(message = "排序不能为空")
+ @NotNull(message = "排序不能为空")
private Integer sort;
/**
* 类型，1菜单，2API资源
*/
- @NotEmpty(message = "类型，1菜单，2API资源不能为空")
+ @NotNull(message = "类型，1菜单，2API资源不能为空")
private Integer type;
/**
* 是否显示
*/
- @NotEmpty(message = "是否显示不能为空")
+ @NotNull(message = "是否显示不能为空")
private Integer hidden;
/**
* 是否删除，1删除，0未删除
*/
- @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ @NotNull(message = "是否删除，1删除，0未删除不能为空")
private Integer isDel;
/**
* 租户字段
@@ -78,6 +83,6 @@
/**
* 是否启用，1启用，0停用
*/
- @NotEmpty(message = "是否启用，1启用，0停用不能为空")
+ @NotNull(message = "是否启用，1启用，0停用不能为空")
private Integer enabled;
}
--
Gitblit v1.8.0