Merge remote-tracking branch 'origin/master'

feige

2024-11-20 b10f260189e5db5b89d9a85ce4fb08984d2aae2a

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

@@ -22,7 +22,16 @@

    List<ZfCollection> selectByCondition(ZfCollection zfCollection);

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