Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 a3aa71fd0ba1b48fe52f080e8d2776f50c5ed514

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

@@ -16,8 +16,11 @@
    private Integer sort;

    @ApiModelProperty(value = "选项名")
    private String option;
    private String optionName;

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

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