From 9140edf9b115a6b38c599878093d595ef84228f1 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sun, 12 Jul 2020 17:10:34 +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/UserRegVo.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java
index 6fecb03..6fcffe1 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.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;
@@ -70,6 +72,7 @@
     /**
      * 所属医院ID 注册用户固定传0
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long hospitalId;
     /**
      * 医院名称
@@ -79,6 +82,7 @@
     /**
      * 科室ID 注册用户固定传0
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long departmentId;
     /**
      * 科室名称
@@ -87,6 +91,7 @@
     /**
      * 职称ID 注册用户固定传0
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long doctorRankId;
     /**
      * 职称
@@ -97,4 +102,16 @@
      */
     @NotNull(message = "医生状态 1正常 0试用不能为空")
     private Boolean doctorState;
+    /**
+     * 资质证书 图片地址
+     */
+    private String doctorCcie;
+    /**
+     * 手机验证码
+     */
+    private String verification;
+    /**
+     * 当前登录用户的id
+     */
+    private Long userId;
 }

--
Gitblit v1.8.0