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

huanghongfa

2021-07-05 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e

 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;

}