From 91f173b2090c9125e1bdc83c17ad8ef05ee8cf7f Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Fri, 03 Apr 2020 14:32:22 +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/HospitalScreening.java |   79 +++++++++++++++++++--------------------
 1 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java
index c296fdb..d856b5d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java
@@ -1,25 +1,22 @@
 package com.kidgrow.oprationcenter.model;
 
-import com.kidgrow.common.model.SuperModel;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
  * @Description: 筛查医院信息表-未完待续<br>
  * @Project: 用户中心<br>
  * @CreateDate: Created in 2020-04-01 09:37:05 <br>
  * @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,37 +24,37 @@
 @AllArgsConstructor
 @TableName("hospital_screening")
 public class HospitalScreening extends SuperModel {
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
-            /**
-    * 医院ID
-    */
-        @NotBlank(message = "医院ID不能为空")
-        private Long hospitalId;
-            /**
-    * 医院名称
-    */
-        private String hospitalName;
-            /**
-    * 医院logo
-    */
-        private String hospitalLogo;
-            /**
-    * 筛查二维码图片
-    */
-        private String hospitalQrImage;
-                    /**
-    * 是否删除,1删除,0未删除
-    */
-        @NotBlank(message = "是否删除,1删除,0未删除不能为空")
-        private Boolean isDel;
-            /**
-    * 租户字段
-    */
-        private String tenantId;
-            /**
-    * 状态,1启用,0停用
-    */
-        @NotBlank(message = "状态,1启用,0停用不能为空")
-        private Boolean enabled;
-                    }
+    /**
+     * 医院ID
+     */
+    @NotEmpty(message = "医院ID不能为空")
+    private Long hospitalId;
+    /**
+     * 医院名称
+     */
+    private String hospitalName;
+    /**
+     * 医院logo
+     */
+    private String hospitalLogo;
+    /**
+     * 筛查二维码图片
+     */
+    private String hospitalQrImage;
+    /**
+     * 是否删除,1删除,0未删除
+     */
+    @NotEmpty(message = "是否删除,1删除,0未删除不能为空")
+    private Boolean isDel;
+    /**
+     * 租户字段
+     */
+    private String tenantId;
+    /**
+     * 状态,1启用,0停用
+     */
+    @NotEmpty(message = "状态,1启用,0停用不能为空")
+    private Boolean enabled;
+}

--
Gitblit v1.8.0