From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
index d1cbbeb..66f31d3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
@@ -24,7 +24,7 @@
@ApiModelProperty("主题")
@NotBlank(groups = {AddGroup.class},message = "主题不能为空")
- private String subject;
+ private String discussSubject;
@ApiModelProperty("类型 1 图文 2 投票")
@Min(value =1,groups = {AddGroup.class},message = "类型不能为空")
@@ -46,13 +46,12 @@
private Date createAt;
@ApiModelProperty("1 单选 2 多选")
- private Integer option;
+ private Integer discussOption;
@ApiModelProperty("投票标题")
private String voteTitle;
@ApiModelProperty("选项集合")
- private List<String> discussOptions;
-
+ private List<ComActDiscussOptionDTO> discussOptions;
}
--
Gitblit v1.7.1