Merge branch 'test' into 'master'

罗元桥

2021-08-02 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f

 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;

}