Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-05-31 faa40222f2e15b68a89d2180b57d444de5b67709

 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;

}