From 9d80c05bdbc18b4d7778828d411deb9b603f6a4b Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 25 七月 2025 15:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
index a3b2aed..a74d8d3 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java
@@ -98,7 +98,7 @@
List<Map<String, Object>> getDetailList(String orderId, String processId, String remarks);
- List<Map<String, Object>> getDetailLists(String orderId, String remarks, Integer productId);
+ List<Map<String, Object>> getDetailLists(String orderId, String remarks, Integer productId,String thickness);
List<Map<String, Object>> getDetailList2(String orderId, String processId, String remarks);
}
--
Gitblit v1.8.0