From 2700299978337e0f9603515472ea901be33e4c0d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 九月 2025 11:20:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index 0e89cea..218252f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -25,7 +25,7 @@
Map<String, Integer> getPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗘灦鏁版嵁鏌ヨ
- List<FlowCard> selectFlowCardMp(Date selectTime1, Date selectTime2, FlowCard flowCard);
+ List<FlowCard> selectFlowCardMp(String selectTime1, String selectTime2, FlowCard flowCard);
//鍒嗘灦鏄庣粏鏌ヨ
List<Map<String, String>> detailsSelectMp(String orderId, FlowCard flowCard);
@@ -74,9 +74,9 @@
Boolean deleteReportingWork(String processId);
Boolean deleteReportingWorkByOrderId(String orderId);
- List<Map<String, String>> selectPrintFlowCardMp(Date selectTime1, Date selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
+ List<Map<String, String>> selectPrintFlowCardMp(String selectTime1, String selectTime2, String orderId, String project, Integer state, FlowCard flowCard);
- List<Map<String, String>> selectPrintFlowCard(Date selectTime1, Date selectTime2);
+ List<Map<String, String>> selectPrintFlowCard(String selectTime1, String selectTime2);
List<Map<String, String>> selectPrintMp(String orderId);
--
Gitblit v1.8.0