Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

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

@@ -21,10 +21,15 @@
    AjaxResult selectDataList(ZfEvent zfEvent, Integer pageNum, Integer pageSize);

    List<ZfEvent> selectByCondition(ZfEvent zfEvent);
    List<ZfEvent> selectByIds(Long[] ids);

    AjaxResult addData(ZfEvent zfEvent);

    AjaxResult addData2(ZfEvent zfEvent);
//    AjaxResult addData2(ZfEvent zfEvent);

    AjaxResult importExcel(MultipartFile file);

    AjaxResult updateData(ZfEvent zfEvent);

    AjaxResult deleteData(Long[] ids);
}