From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 0140d61..0c4f46a 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -15,7 +15,7 @@
int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
- int updateSettle2(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("plt")Integer plt);
+ int updateSettle2(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("plt")Integer plt,@Param("inTime")String inTime);
List<Order> selectComplete();
--
Gitblit v1.9.1