From 3053f3c6a8ea26d204e83e9f17a418d6928da5bc Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 16 Jun 2020 19:19:11 +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/SysDoctor.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java
index 3da26fb..00318ef 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/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 com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -35,6 +37,7 @@
/**
* 所属医院ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
@NotNull(message = "所属医院ID不能为空")
private Long hospitalId;
/**
@@ -45,6 +48,7 @@
/**
* 科室ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
/**
* 科室名称
@@ -67,6 +71,7 @@
/**
* 职称ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long doctorRankId;
/**
* 职称
@@ -102,6 +107,10 @@
@TableLogic
private Boolean isDel;
/**
+ * 是否管理员 0否 1是
+ */
+ private Boolean isAdminUser;
+ /**
* 医生状态 1正常 0试用
*/
@NotNull(message = "医生状态 1正常 0试用不能为空")
@@ -114,7 +123,8 @@
/**
* 销售代表的id
*/
- private String serverUserId;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long serverUserId;
/**
* 销售代表名称
*/
--
Gitblit v1.8.0