From dfdd4bd5d112a17ccd1483ad11fe023817d54d26 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 22 七月 2023 15:20:13 +0800
Subject: [PATCH] 45648

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
index 722848a..9a82850 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
@@ -60,27 +60,27 @@
     }
 
 
-//    /**
-//     * 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
-//     */
-////    @PreAuthorize("@ss.hasPermi('system:property:export')")
-//    @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    public void export(HttpServletResponse response, ZfEvent zfEvent) {
-//        List<ZfEvent> list = new ArrayList<>();
-//
-//        list = zfEventService.selectByCondition(zfEvent);
-//        log.info("瀵煎嚭璁板綍涓�:{}", list);
-//        ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
-//        util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
-//
-//    }
     /**
      * 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
      */
 //    @PreAuthorize("@ss.hasPermi('system:property:export')")
     @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
-    @PostMapping("/export/{ids}")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZfEvent zfEvent) {
+        List<ZfEvent> list = new ArrayList<>();
+
+        list = zfEventService.selectByCondition(zfEvent);
+        log.info("瀵煎嚭璁板綍涓�:{}", list);
+        ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
+        util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+
+    }
+    /**
+     * 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
+     */
+//    @PreAuthorize("@ss.hasPermi('system:property:export')")
+    @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+    @PostMapping("/export1/{ids}")
     public void export(HttpServletResponse response, @PathVariable Long[] ids) {
         List<ZfEvent> list = zfEventService.selectByIds(ids);
         log.info("瀵煎嚭璁板綍涓�:{}", list);

--
Gitblit v1.9.1