From 0a8b731d9cf46c78c0c4c66fa9954eeb262e4017 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Mon, 10 Aug 2020 09:20:50 +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 |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 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 6d57e55..14edf52 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
@@ -1,6 +1,7 @@
 package com.kidgrow.usercenter.model;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -105,7 +106,6 @@
     /**
      * 是否删除,1删除,0未删除
      */
-    @TableLogic
     private Boolean isDel;
     /**
      * 是否管理员 0否 1是
@@ -114,8 +114,14 @@
     /**
      * 医生状态 1正常 0试用
      */
-    @NotNull(message = "医生状态 1正常 0试用不能为空")
+    @NotNull(message = "医生状态不能为空")
     private Boolean doctorState;
+    /**
+     * 医生类型 0H+C端都可用   1H端   2C端 默认2
+     */
+    @NotNull(message = "医生类型不能为空")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer doctorType;
     /**
      * 启用禁用状态,1启用,0停用
      */
@@ -134,4 +140,8 @@
      * 创建者的部门
      */
     private String createUserOrgCode;
+    /**
+     * 医生资质证书
+     */
+    private String doctorCcie;
 }

--
Gitblit v1.8.0