From 8190823a593d3123384d3a75774ad19ecea07204 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 15 Jun 2020 11:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java | 10 +---------
1 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java
index e26093c..e1ae53f 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java
@@ -29,32 +29,26 @@
/**
* 医院标识id
*/
- @NotEmpty(message = "医院标识id不能为空")
private Long hospitalId;
/**
* 医院名称
*/
- @NotEmpty(message = "医院名称不能为空")
private String hospitalName;
/**
* 科室ID
*/
- @NotEmpty(message = "科室ID不能为空")
private Long departmentId;
/**
* 科室名称
*/
- @NotEmpty(message = "科室名称不能为空")
private String departmentName;
/**
* 医生id
*/
- @NotEmpty(message = "医生id不能为空")
private Long doctorId;
/**
* 医生姓名
*/
- @NotEmpty(message = "医生姓名不能为空")
private String doctorName;
/**
* 公开类型 0公开 1私有
@@ -72,13 +66,11 @@
/**
* 模板内容
*/
- @NotEmpty(message = "模板内容不能为空")
private String templeteNote;
/**
* 是否删除，1删除，0未删除
*/
- @TableLogic
- @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+
private Boolean isDel;
/**
* 状态，1启用，0停用
--
Gitblit v1.8.0