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

DESKTOP-71BH0QO\L、ming

2021-05-10 b7ee93df9c0f10ce17431fd1ef33506742977b82

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

@@ -23,4 +23,7 @@
    @ApiModelProperty(value = "选项类型 0 固定选项 1 自定义选项", example = "0")
    private Integer type;

    @ApiModelProperty(value = "题目选项ID", example = "0")
    private Long selectionId;

}