From 519a87f05bd981ae4fcb56fb4cbe56cd119e24b0 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 20 Apr 2020 17:32:06 +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/SysDepartment.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
index efa6b8c..4ec743c 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
@@ -1,18 +1,15 @@
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.TableLogic;
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 org.hibernate.validator.constraints.NotEmpty;
-import java.util.Date;
+import javax.validation.constraints.NotNull;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -39,12 +36,17 @@
/**
* 组织Id
*/
- @NotEmpty(message = "组织Id不能为空")
+ @NotNull(message = "组织Id不能为空")
private Long orgId;
+ /**
+ * 医院Id
+ */
+ @NotNull(message = "医院Id不能为空")
+ private Long hospitalId;
/**
* 负责的销售代表
*/
- @NotEmpty(message = "负责的销售代表不能为空")
+ @NotNull(message = "负责的销售代表不能为空")
private Long serverUserId;
/**
* 销售代表的名字
@@ -59,4 +61,9 @@
* 状态，1启用，0停用
*/
private Boolean enabled;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @TableLogic
+ private Boolean isDel;
}
--
Gitblit v1.8.0