From 73d5561cbf2bea50acc22f91050fcc3557d49de4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 17 Aug 2020 09:58:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysDoctor.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysDoctor.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysDoctor.java
index b575c8e..b2c50e4 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysDoctor.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysDoctor.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -34,6 +36,7 @@
/**
* 所属医院ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@NotNull(message = "所属医院ID不能为空")
private Long hospitalId;
/**
@@ -44,6 +47,7 @@
/**
* 科室ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
/**
* 科室名称
@@ -66,6 +70,7 @@
/**
* 职称ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long doctorRankId;
/**
* 职称
@@ -113,7 +118,8 @@
/**
* 销售代表的id
*/
- private String serverUserId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long serverUserId;
/**
* 销售代表名称
*/
--
Gitblit v1.8.0