From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
index 49548e1..7ffe281 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
@@ -19,7 +19,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@@ -101,7 +101,7 @@
@PostMapping("/export")
@ApiOperation("瀵煎嚭鍙戣揣瀹℃壒")
public void export(HttpServletResponse response) {
- List<ShipmentApproval> list = shipmentApprovalService.list(null);
+ List<ShipmentApproval> list = shipmentApprovalService.list();
ExcelUtil<ShipmentApproval> util = new ExcelUtil<ShipmentApproval>(ShipmentApproval.class);
util.exportExcel(response, list, "鍙戣揣瀹℃壒");
}
--
Gitblit v1.9.3