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

zxl

5 天以前 8063ee7eee51bfe25a09428e6efc60f828b270c6

 manager-api/src/main/java/cn/lili/controller/lmk/VideoTagController.java

@@ -70,7 +70,7 @@

    @GetMapping("/list")
    @ApiOperation(value = "列表", notes = "列表")
    public Result list() {
        return videoTagService.all();
    public Result list(String tagName) {
        return videoTagService.all(tagName);
    }
}