From 1df2ad6224fa4bd1ca38d235d5e4b917262added Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 19 Feb 2021 10:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 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..e93021e 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,29 @@
* 医院数据创建时间
*/
private Date createTime;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 租户字段
+ */
+ private String tenantId;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+ /**
+ * 是否试用，true正式，false试用
+ */
+ private Boolean OrderType;
+ /**
+ * 部门联系人
+ */
+ private String departmentLink;
+
+ /**
+ * 部门联系人
+ */
+ private String departmentTel;
}
--
Gitblit v1.8.0