Merge remote-tracking branch 'origin/master'

feige

2024-11-20 b10f260189e5db5b89d9a85ce4fb08984d2aae2a

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

@@ -49,6 +49,11 @@
        return zfCollectionService.selectDataList(zfCollection, pageNum, pageSize);
    }

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

    /**
     * 根据id查询
     */