From 91f173b2090c9125e1bdc83c17ad8ef05ee8cf7f Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Fri, 03 Apr 2020 14:32:22 +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/SysUserOrg.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserOrg.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserOrg.java
index 21e046e..3f8ef05 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserOrg.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserOrg.java
@@ -6,15 +6,16 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 用户和组织关系表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -22,24 +23,24 @@
@AllArgsConstructor
@TableName("sys_user_org")
public class SysUserOrg extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 用户id
- */
- @NotBlank(message = "用户id不能为空")
- private Long userId;
- /**
- * 组织ID
- */
- @NotBlank(message = "组织ID不能为空")
- private Long orgId;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- }
+ /**
+ * 用户id
+ */
+ @NotEmpty(message = "用户id不能为空")
+ private Long userId;
+ /**
+ * 组织ID
+ */
+ @NotEmpty(message = "组织ID不能为空")
+ private Long orgId;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+}
--
Gitblit v1.8.0