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

CeDo

2021-05-20 5ade6f6e4532b65b96d80eabe5d92302f6f817f4

 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;

}