From 4bd194307bd9b5c78b0c43b8fbd22be1155bcc01 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 28 Aug 2020 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java
index e5fc6f0..f9a1fe3 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
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;
@@ -20,6 +22,11 @@
@AllArgsConstructor
public class DoctorUserAll extends Model<DoctorUserAll> {
private static final long serialVersionUID = 1L;
+ /**
+ * 医生姓名
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long doctorId;
/**
* 医生姓名
*/
@@ -70,6 +77,10 @@
private Boolean docenabled;
+ /**
+ * 医院id
+ */
+ private String hospitalId;
/**
* 医院名称 同组织名字
*/
@@ -146,6 +157,11 @@
/**
* 科室/部门名称 同组织名称
*/
+ private String departmentId;
+
+ /**
+ * 科室/部门名称 同组织名称
+ */
private String departmentName;
/**
* 销售代表的名字
--
Gitblit v1.8.0