Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-09 9576bebcacea938771f6f5b51d958e6a4ac59df6

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

@@ -15,7 +15,7 @@
    private String optionName;
    @ApiModelProperty("选项内容")
    private String content;
    @ApiModelProperty("选项类型 0单选1多选2问答题")
    private String type;
    @ApiModelProperty("选项类型 0 固定选项 1 自定义选项")
    private Integer type;

}