From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 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..380586f 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,5 @@
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;
@@ -9,7 +8,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@@ -51,16 +49,34 @@
/**
* 是否删除，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;
}
--
Gitblit v1.8.0