From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
index 12411f9..f05780d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
@@ -5,6 +5,7 @@
import com.matrix.system.hive.vo.OrderFlowVo;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
public interface SysOrderFlowDao {
@@ -18,4 +19,9 @@
List<OrderFlowVo> selectInPage(@Param("record") OrderFlowListDto orderFlowListDto);
Integer selectTotal(@Param("record")OrderFlowListDto orderFlowListDto);
+
+ Integer updateTimeByOrderId(@Param("orderId") Long orderId, @Param("payTime") Date payTime);
+
+ Integer deleteByOrderId(@Param("orderId") Long orderId);
+
}
--
Gitblit v1.9.1