From 47818e4505abc4b6ec9fdbc03dd427d66db37514 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 22 Jul 2020 19:20:59 +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/vo/HospitalListVo.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java
index 1074d6d..ce17542 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java
@@ -1,6 +1,8 @@
package com.kidgrow.usercenter.vo;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -23,6 +25,7 @@
/**
* 医院id
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long hospitalId;
/**
* 医院名称 同组织名字
@@ -31,11 +34,16 @@
/**
* 组织ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/**
- * 区号
+ * 医院编码
*/
private String hospitalCode;
+ /**
+ * 医院区号
+ */
+ private String areaCode;
/**
* 医院电话
*/
@@ -59,6 +67,7 @@
/**
* 负责的销售代表
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long serverUserId;
/**
* 销售代表的名字
@@ -67,6 +76,7 @@
/**
* 科室id
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
/**
* 科室/部门名称 同组织名称
@@ -88,4 +98,16 @@
* 医院数据创建时间
*/
private Date createTime;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 租户字段
+ */
+ private String tenantId;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
}
--
Gitblit v1.8.0