Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

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