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

CeDo

2021-05-21 2364dd5dad496a78c7c2d1122ef9ae8adec34c34

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

@@ -19,4 +19,6 @@
    private Integer total;
    @ApiModelProperty("比例")
    private String proportion;
    @ApiModelProperty("选项类型 0 固定选项 1 自定义选项")
    private Integer type;
}