Merge remote-tracking branch 'origin/master'

feige

2024-06-11 8a7e33332203a2e1334ba55a4838b6b1060d406c

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

@@ -25,7 +25,11 @@

    AjaxResult addData(ZfEvent zfEvent);

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

    AjaxResult importExcel(MultipartFile file);

    AjaxResult updateData(ZfEvent zfEvent);

    AjaxResult deleteData(Long[] ids);
}