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/SysUser.java | 122 +++++++++++++++++++---------------------
1 files changed, 59 insertions(+), 63 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUser.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUser.java
index 0025b41..dbebe1b 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUser.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUser.java
@@ -1,25 +1,21 @@
package com.kidgrow.usercenter.model;
-import com.kidgrow.common.model.SuperModel;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+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)
@@ -27,59 +23,59 @@
@AllArgsConstructor
@TableName("sys_user")
public class SysUser extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 用户账号
- */
- @NotBlank(message = "用户账号不能为空")
- private String username;
- /**
- * 账号密码
- */
- @NotBlank(message = "账号密码不能为空")
- private String password;
- /**
- * 昵称
- */
- private String nickname;
- /**
- * 头像Url
- */
- private String headImgUrl;
- /**
- * 联系电话
- */
- private String mobile;
- /**
- * 性别
- */
- private Integer sex;
- /**
- * 是否启用，1启用，0停用
- */
- @NotBlank(message = "是否启用，1启用，0停用不能为空")
- private Integer enabled;
- /**
- *
- */
- @NotBlank(message = "不能为空")
- private String type;
- /**
- *
- */
- private String company;
- /**
- *
- */
- private String openId;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Integer isDel;
- /**
- * 租户字段
- */
- private String tenantId;
- }
+ /**
+ * 用户账号
+ */
+ @NotEmpty(message = "用户账号不能为空")
+ private String username;
+ /**
+ * 账号密码
+ */
+ @NotEmpty(message = "账号密码不能为空")
+ private String password;
+ /**
+ * 昵称
+ */
+ private String nickname;
+ /**
+ * 头像Url
+ */
+ private String headImgUrl;
+ /**
+ * 联系电话
+ */
+ private String mobile;
+ /**
+ * 性别
+ */
+ private Integer sex;
+ /**
+ * 是否启用，1启用，0停用
+ */
+ @NotEmpty(message = "是否启用，1启用，0停用不能为空")
+ private Integer enabled;
+ /**
+ *
+ */
+ @NotEmpty(message = "不能为空")
+ private String type;
+ /**
+ *
+ */
+ private String company;
+ /**
+ *
+ */
+ private String openId;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ private Integer isDel;
+ /**
+ * 租户字段
+ */
+ private String tenantId;
+}
--
Gitblit v1.8.0