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

CeDo

2021-05-13 a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706

 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;

}