From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 961a59d..0f7e50b 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
@@ -6,9 +6,12 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,6 +26,7 @@
@ApiModel("议事投票新增编辑")
public class ComActDiscussDTO {
@ApiModelProperty("主键")
+ @NotNull(message = "一起议id不能为空", groups = {PutGroup.class})
private Long id;
@ApiModelProperty("主题")
@@ -75,6 +79,16 @@
@ApiModelProperty(value = "每人可投票数")
private Integer count;
+ @ApiModelProperty(value = "是否是小程序用户", hidden = true)
+ private Boolean isApplets;
+
+ @ApiModelProperty(value = "当前登录用户信息", hidden = true)
+ private LoginUserInfoVO loginUserInfo;
+
+ @ApiModelProperty("投票结果")
+ @NotBlank(message = "投票结果不能为空", groups = {PutGroup.class})
+ private String publishResult;
+
/**
* 类型 1 议事 2 投票
*/
--
Gitblit v1.7.1