From 76f834a60cd35247b18e9bc9f53ee6dcf2ad08ba Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 05 三月 2025 16:53:25 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 43fcea6..d3acb91 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -387,7 +387,8 @@
ifsInventoryQuantityDto.setBeginDeclareDate(null);
ifsInventoryQuantityDto.setEndDeclareDate(null);
- return standardTreeMapper.getIfsByOver(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
+ IPage<IfsInventoryQuantitySupplierDto> ifsByOver = standardTreeMapper.getIfsByOver(page, QueryWrappers.queryWrappers(ifsInventoryQuantityDto), beginDeclareDate, endDeclareDate);
+ return ifsByOver;
}
/**
--
Gitblit v1.9.3