合并不行

feige

2023-05-17 462c16ca4ec52bdea6cbb35514e8fd78d6b5f38c

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZDictController.java

@@ -35,7 +35,7 @@
        return zDictService.listAllDict();
    }

    @GetMapping
    @GetMapping("/byId")
    public AjaxResult getDictById(@PathParam("id")Integer id){
        ZDict result = zDictService.getById(id);
        return AjaxResult.success(result);