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/questnaire/UserSubAnswerSelectionStatVO.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserSubAnswerSelectionStatVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserSubAnswerSelectionStatVO.java
index 29402ee..cc99696 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserSubAnswerSelectionStatVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserSubAnswerSelectionStatVO.java
@@ -1,5 +1,7 @@
 package com.panzhihua.common.model.vos.community.questnaire;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,6 +10,7 @@
 @ApiModel("用户调查问卷题目-选择项统计信息")
 public class UserSubAnswerSelectionStatVO {
     @ApiModelProperty(value = "调查问卷题目ID", hidden = true)
+    @JsonIgnore
     private Long subId;
     @ApiModelProperty("选项")
     private String optionName;
@@ -17,4 +20,6 @@
     private Integer total;
     @ApiModelProperty("比例")
     private String proportion;
+    @ApiModelProperty("选项类型 0 固定选项 1 自定义选项")
+    private Integer type;
 }

--
Gitblit v1.7.1