From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java
index 39e98ea..7f0b27b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java
@@ -1,11 +1,15 @@
package com.panzhihua.common.model.vos.community;
+import java.math.BigDecimal;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -17,13 +21,18 @@
@ApiModel("一起议选项")
public class ComActDiscussOptionVO {
@ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("一起议主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long discussId;
@ApiModelProperty("选项内容")
private String optionContent;
+
+ @ApiModelProperty("选项图片url")
+ private String optionUrl;
@ApiModelProperty("create_at")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -31,4 +40,16 @@
@ApiModelProperty("投票数量")
private Integer num;
+
+ @ApiModelProperty("投票总数量")
+ private Integer allNum;
+
+ @ApiModelProperty("是否已经投票 1 是 0 否")
+ private Integer haveVote = 0;
+
+ @ApiModelProperty("投票选项占比")
+ private BigDecimal percent;
+
+ @ApiModelProperty("是否需要填写原因")
+ private Boolean needReason;
}
--
Gitblit v1.7.1