Merge branch 'test_future_wangge' into test

CeDo

2021-06-05 a5ebd7103f2375c8c241c6f14c586c7d75b0dd79

 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;

}