From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 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..f17dde6 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
@@ -1,14 +1,16 @@
package com.panzhihua.common.model.dtos.community;
-import com.panzhihua.common.validated.AddGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
+import java.util.List;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
-import java.util.Date;
-import java.util.List;
+
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -23,11 +25,11 @@
private Long id;
@ApiModelProperty("主题")
- @NotBlank(groups = {AddGroup.class},message = "主题不能为空")
- private String subject;
+ @NotBlank(groups = {AddGroup.class}, message = "主题不能为空")
+ private String discussSubject;
@ApiModelProperty("类型 1 图文 2 投票")
- @Min(value =1,groups = {AddGroup.class},message = "类型不能为空")
+ @Min(value = 1, groups = {AddGroup.class}, message = "类型不能为空")
private Integer type;
@ApiModelProperty("图片地址 多个用逗号隔开")
@@ -36,23 +38,22 @@
@ApiModelProperty("地址")
private String address;
- @ApiModelProperty(value = "发布人主键",hidden = true)
+ @ApiModelProperty(value = "发布人主键", hidden = true)
private Long userId;
- @ApiModelProperty(value = "社区主键",hidden = true)
+ @ApiModelProperty(value = "社区主键", hidden = true)
private Long communityId;
@ApiModelProperty("create_at")
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