Merge remote-tracking branch 'origin/master'

CeDo

2021-04-12 c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/UserSubAnswerSelectionStatVO.java

@@ -1,5 +1,6 @@
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 +9,7 @@
@ApiModel("用户调查问卷题目-选择项统计信息")
public class UserSubAnswerSelectionStatVO {
    @ApiModelProperty(value = "调查问卷题目ID", hidden = true)
    @JsonIgnore
    private Long subId;
    @ApiModelProperty("选项")
    private String optionName;