From cb9bc5daaa7ee5978c07d5107d3301473617f367 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sat, 25 Jul 2020 17:14:42 +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 | 15 ++++++++++++---
1 files changed, 12 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 639fef6..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
@@ -1,12 +1,17 @@
package com.kidgrow.oprationcenter.model;
+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>
@@ -28,7 +33,8 @@
/**
* 提需求的医生
*/
- @NotEmpty(message = "提需求的医生不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @NotNull(message = "提需求的医生不能为空")
private Long doctorId;
/**
* 医生姓名
@@ -42,7 +48,8 @@
/**
* 科室ID
*/
- @NotEmpty(message = "科室ID不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @NotNull(message = "科室ID不能为空")
private Long departmentId;
/**
* 科室名称
@@ -52,7 +59,8 @@
/**
* 医院标识id
*/
- @NotEmpty(message = "医院标识id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @NotNull(message = "医院标识id不能为空")
private Long hospitalId;
/**
* 医院名称
@@ -66,6 +74,7 @@
/**
* 是否删除，1删除，0未删除
*/
+ @TableLogic
private Boolean isDel;
/**
* 状态，1已查收，0未处理
--
Gitblit v1.8.0