From a92b97225a0676c3645b72d8945542f7db2e05ae Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 07 五月 2025 11:26:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java
index 55c3bf1..16a850c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsBomController.java
@@ -19,7 +19,7 @@
  * BOM鏁版嵁绠＄悊Controller
  * 
  * @author zhl
- * @date 2025-04-22
+ * &#064;date  2025-04-22
  */
 @RestController
 @RequestMapping("/ApsBom")
@@ -35,7 +35,7 @@
     @GetMapping("/list")
     public TableDataInfo list(ApsBom apsBom)
     {
-        startPage();
+//        startPage();
         List<ApsBom> list = apsBomService.selectApsBomList(apsBom);
         return getDataTable(list);
     }
@@ -49,7 +49,7 @@
     public void export(HttpServletResponse response, ApsBom apsBom)
     {
         List<ApsBom> list = apsBomService.selectApsBomList(apsBom);
-        ExcelUtil<ApsBom> util = new ExcelUtil<ApsBom>(ApsBom.class);
+        ExcelUtil<ApsBom> util = new ExcelUtil<>(ApsBom.class);
         util.exportExcel(response, list, "BOM鏁版嵁绠＄悊鏁版嵁");
     }
 

--
Gitblit v1.9.3