Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-java into dev

zhanghua

4 天以前 be0fc5c20dde87d7abb53f6537ba64743cd4cf52

 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);
    }
}