Merge remote-tracking branch 'origin/master'

feige

2024-10-18 98cd4713254614381ede8fa42d0820a3ffc1d53e

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