From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +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 5cbc12e..47e0205 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
@@ -94,7 +94,7 @@
List<Map<String, String>> getPrimaryListLimt(String orderId, String processId, String remarks);
- List<Map<String, String>> getPrimaryListLimts(String customerName, String project, String remarks);
+ List<Map<String, String>> getPrimaryListLimts(Integer customerId, String project, String remarks);
List<Map<String, Object>> getDetailList(String orderId, String processId, String remarks);
--
Gitblit v1.8.0