From d7a8baeff8b0e68c54a959e5f46f639c54aad1d1 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 17:15:29 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
index 1042657..7bd915a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
@@ -3,26 +3,52 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.List;
-
/**
* @Author: llming
* @Description:
*/
@Data
public class QuestnaireVO {
- @ApiModelProperty(value = "问卷调查Id")
- private Long questId;
- @ApiModelProperty(value = "问卷标题")
- private String queTitle;
+
+ @ApiModelProperty(value = "问卷调查id")
+ private Long id;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+ @ApiModelProperty(value = "用户id", hidden = true)
+ private Long userId;
+ @ApiModelProperty(value = "问卷调查主题")
+ private String title;
@ApiModelProperty(value = "问卷描述")
private String queDescribe;
- @ApiModelProperty(value = "提供居民", example = "true", required = true)
- private Boolean forMasses;
- @ApiModelProperty(value = "提供党员", example = "true", required = true)
- private Boolean forParty;
- @ApiModelProperty(value = "提供志愿者", example = "true", required = true)
- private Boolean forVolunteer;
- @ApiModelProperty(value = "题目")
- private List<QuestnaiteSubVO> questnaiteSubVOS;
+ @ApiModelProperty(value = "身份（1.全部居民 2.党员 3.志愿者）")
+ private Integer identity;
+ @ApiModelProperty("广告顶部（1.是 2.否）")
+ private Integer adverPositionTop;
+ @ApiModelProperty("广告弹窗（1.是 2.否 ）")
+ private Integer adverPositionPopup;
+ @ApiModelProperty("广告应用（1.是 2.否）")
+ private Integer adverPositionApplication;
+ @ApiModelProperty("调研开始时间")
+ private String startTime;
+ @ApiModelProperty("调研结束时间")
+ private String endTime;
+ @ApiModelProperty("是否强制调研（1.是 2.否）")
+ private Integer isForce;
+ @ApiModelProperty("是否封面（1.是 2.否）")
+ private Integer isCover;
+ @ApiModelProperty("问卷调查备注(应用名称)")
+ private String remark;
+ @ApiModelProperty("组件json数据")
+ private String jsonObject;
+ @ApiModelProperty("是否发布（1.是 2.否）")
+ private Integer isRelease;
+
+ /**
+ * 身份（1.全部居民 2.党员 3.志愿者）
+ */
+ public interface identity {
+ int jm = 1;
+ int dy = 2;
+ int zyz = 3;
+ }
}
--
Gitblit v1.7.1