From c7405acff915d6633f974ddb9faacd229abec870 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 29 九月 2021 17:47:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java | 18 ++++++++++++++++--
1 files changed, 16 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..14ef6a0 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,13 @@
package com.panzhihua.common.model.vos.community;
+import java.math.BigDecimal;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -25,10 +27,22 @@
@ApiModelProperty("选项内容")
private String optionContent;
+ @ApiModelProperty("选项图片url")
+ private String optionUrl;
+
@ApiModelProperty("create_at")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("投票数量")
private Integer num;
+
+ @ApiModelProperty("投票总数量")
+ private Integer allNum;
+
+ @ApiModelProperty("是否已经投票 1 是 0 否")
+ private Integer haveVote = 0;
+
+ @ApiModelProperty("投票选项占比")
+ private BigDecimal percent;
}
--
Gitblit v1.7.1