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

huanghongfa

2021-04-28 43c6e133a84d50f4952cd1df2f409d07be338cc4

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

@@ -16,6 +16,6 @@
    @ApiModelProperty("选项内容")
    private String content;
    @ApiModelProperty("选项类型 0 固定选项 1 自定义选项")
    private String type;
    private Integer type;

}