From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
index 8d32ba7..ef2cd14 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
@@ -48,8 +48,8 @@
         }
         Integer type = comActDiscussDTO.getType();
         String voteTitle = comActDiscussDTO.getVoteTitle();
-        List<String> discussOptions = comActDiscussDTO.getDiscussOptions();
-        if (type.intValue()==2 ) {
+        List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
+        if (type.equals(2)) {
             if(ObjectUtils.isEmpty(voteTitle)){
                 return R.fail("投票标题不能为空");
             }

--
Gitblit v1.7.1