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

CeDo

2021-04-29 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf

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

@@ -20,4 +20,7 @@

    @ApiModelProperty(value = "选项内容")
    private String content;

    @ApiModelProperty(value = "选项类型 0 固定选项 1 自定义选项")
    private Integer type;
}