Merge remote-tracking branch 'origin/master'

jinquanOu

2024-06-11 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe

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

@@ -50,6 +50,11 @@
        return zHonorService.selectDataList(zHonor,pageNum,pageSize);
    }

    @GetMapping("/type")
    public AjaxResult listType(){
        return zHonorService.listType();
    }

    /**
     * 根据id查询
     */