From 7382373b1ad742f9696e5ddb93c60b3fb7ee2bdc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 十一月 2025 15:11:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TDeliberationVote.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TDeliberationVote.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TDeliberationVote.java
index e4b02f8..7cc34ce 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TDeliberationVote.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TDeliberationVote.java
@@ -10,6 +10,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -52,4 +53,12 @@
@TableField("status")
private Integer status;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "选项")
+ private List<TDeliberationVoteOption> options;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "是否已投 1否2是")
+ private Integer voteState=1;
+
}
--
Gitblit v1.7.1