From 31de20695ac5fc8562c5922fcbe8729ae4e146a1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 29 Jun 2020 14:20:39 +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/SysHospital.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
index 32bea0f..026be71 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
@@ -1,14 +1,14 @@
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>
@@ -35,7 +35,7 @@
/**
* 组织ID-
*/
- @NotNull(message = "组织ID不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/**
* 医院简称
@@ -57,6 +57,10 @@
* 医院电话
*/
private String hospitalTel;
+ /**
+ * 医院联系人
+ */
+ private String hospitalLink;
/**
* 医院所在省
*/
@@ -129,4 +133,13 @@
* 是否删除，1删除，0未删除
*/
private Boolean isDel;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
+
+ /**
+ * 帐号数量,默认6
+ */
+ private Integer accountsCount;
}
--
Gitblit v1.8.0