From 659c74e7aaf751cc10ac47b7e0939f235a17d873 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 10:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java
index b24ab65..289372e 100644
--- a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java
+++ b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInventoryController.java
@@ -45,7 +45,7 @@
      */
     @ApiOperation(value = "鐗╂枡搴撳瓨淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes = "鐗╂枡搴撳瓨淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
     @GetMapping(value = "/list")
-    public Result<IPage<LswMaterialInventory>> queryPageList(@RequestParam(name = "materialId") String materialId,
+    public Result<IPage<LswMaterialInventory>> queryPageList(@RequestParam(name = "materialId", defaultValue = "null") String materialId,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         LambdaQueryWrapper<LswMaterialInventory> queryWrapper = new LambdaQueryWrapper<>();

--
Gitblit v1.9.3