From 04c359a40d51c391fdfea626e7f147422a33b89f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 19 Jun 2020 09:43:08 +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/SysRole.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRole.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRole.java
index 838d3b7..05938c7 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRole.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysRole.java
@@ -8,6 +8,8 @@
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
  *
@@ -38,7 +40,7 @@
     /**
      * 是否删除,1删除,0未删除
      */
-    @NotEmpty(message = "是否删除,1删除,0未删除不能为空")
+    @NotNull(message = "是否删除,1删除,0未删除不能为空")
     private Integer isDel;
     /**
      * 租户字段
@@ -47,7 +49,7 @@
     /**
      * 状态,1启用,0停用
      */
-    @NotEmpty(message = "状态,1启用,0停用不能为空")
+    @NotNull(message = "状态,1启用,0停用不能为空")
     private Integer enabled;
 
 }

--
Gitblit v1.8.0