From 04c359a40d51c391fdfea626e7f147422a33b89f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 19 Jun 2020 09:43:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysFeedback.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysFeedback.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysFeedback.java
index bc8236d..0d72d8c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysFeedback.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysFeedback.java
@@ -2,12 +2,16 @@
 
 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;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -29,7 +33,8 @@
     /**
      * 提需求的医生
      */
-    @NotEmpty(message = "提需求的医生不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotNull(message = "提需求的医生不能为空")
     private Long doctorId;
     /**
      * 医生姓名
@@ -43,7 +48,8 @@
     /**
      * 科室ID
      */
-    @NotEmpty(message = "科室ID不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotNull(message = "科室ID不能为空")
     private Long departmentId;
     /**
      * 科室名称
@@ -53,7 +59,8 @@
     /**
      * 医院标识id
      */
-    @NotEmpty(message = "医院标识id不能为空")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @NotNull(message = "医院标识id不能为空")
     private Long hospitalId;
     /**
      * 医院名称

--
Gitblit v1.8.0