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

peng

3 天以前 d4d9ea89dd109cb975eaa3412a15c5ff6e8d11dd

 buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java

@@ -142,4 +142,10 @@
    public Result changeThumbsUp(@RequestBody @Validated(Add.class) ThumbsUpRecordForm form) {
        return videoService.changeThumbsUp(form);
    }

    @GetMapping("/es/search")
    @ApiOperation(value = "视频搜索", notes = "视频搜索")
    public Result esSearch(VideoEsQuery query) {
        return videoService.esSearch(query);
    }
}