From b92f672511421c4f1b673242ef6ac5b186d10d1a Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 09 Dec 2020 09:31:18 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 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 15651e4..d03f898 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,6 +1,6 @@
 package com.kidgrow.oprationcenter.model;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
+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;
@@ -9,7 +9,6 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.validation.constraints.NotNull;
 
@@ -51,16 +50,40 @@
     /**
      * 是否删除,1删除,0未删除
      */
-    @TableLogic
-    @NotEmpty(message = "是否删除,1删除,0未删除不能为空")
-    private Boolean isDel;
-    /**
-     * 租户字段
-     */
-    private String tenantId;
+    private int isDel;
     /**
      * 状态,1启用,0停用
      */
-    @NotEmpty(message = "状态,1启用,0停用不能为空")
-    private Boolean enabled;
+    private int enabled;
+
+    /**
+     * 是否关闭筛查推送 ,0否,1是
+     */
+    private int isScreeningPush;
+
+    /**
+     * 推送标题
+     */
+    private String pushTitle;
+
+    /**
+     * 推送描述
+     */
+    private String pushDescription;
+
+    /**
+     * 推送背景图片
+     */
+    private String pushBackImage;
+
+    /**
+     * 微站首页中间位置图片
+     */
+    private String homePage;
+
+    /**
+     * 查询关键字
+     */
+    @TableField(exist = false)
+    private String keyWord;
 }

--
Gitblit v1.8.0