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

huanghongfa

2021-09-27 5c70b1f8fd59e1d35014c08d63a28f58b7aa9249

 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;

}