Merge remote-tracking branch 'origin/master'

feige

2024-10-18 98cd4713254614381ede8fa42d0820a3ffc1d53e

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