Merge remote-tracking branch 'origin/master'

fei

4 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

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