From 9c19d5222d91bb191808d868aa056bfedbacb0c9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 03 六月 2023 02:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
index 9cf7a88..79bd20c 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
@@ -203,4 +203,7 @@
* 主动完成线下收款
*/
void completeCollection();
+
+
+ ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType);
}
--
Gitblit v1.7.1