Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-12 538b74a65dffadbd143a9e7e4218e0d0d91100fa

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

@@ -1,6 +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;
@@ -19,4 +20,6 @@
    private Integer total;
    @ApiModelProperty("比例")
    private String proportion;
    @ApiModelProperty("选项类型 0 固定选项 1 自定义选项")
    private Integer type;
}