Merge remote-tracking branch 'origin/master'

feige

2024-11-05 b4895bdc5d9268e55c0023b92cc7c2d68ba33e46

 zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java

@@ -25,5 +25,13 @@
    List<ZfCollection> selectByIds(Long[] ids);
    AjaxResult importExcel(MultipartFile file);

    AjaxResult addData2(ZfCollection zfCollection);
//    AjaxResult addData2(ZfCollection zfCollection);

    AjaxResult addData(ZfCollection zfCollection);

    AjaxResult updateData(ZfCollection zfCollection);

    AjaxResult deleteData(Long[] ids);

    AjaxResult listType();
}