From 38b44e0c9996f06524903417f1d0a3f746b4550b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 04 十二月 2023 17:47:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
index a411ee5..59cbc6f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -78,12 +78,7 @@
     @SneakyThrows
     @LogSave(operationType = "鍗″彛绠$悊", contain = "瀵煎嚭鍗″彛")
     public void export(HttpServletResponse response,
-                       @RequestParam(required = false) Integer size,
-                       @RequestParam(required = false) Integer current,
                        @RequestParam(required = false) String bayonetName) {
-        Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
-        equipmentBayonetPage.setCurrent(current);
-        equipmentBayonetPage.setSize(size);
-        EasyExcelUtils.export(response, "鏁版嵁", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentPage(equipmentBayonetPage, bayonetName).getRecords());
+        EasyExcelUtils.export(response, "鏁版嵁", EquipmentBayonetVO.class, iEquipmentBayonetService.selectEquipmentList(bayonetName));
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0