From 581835e407eab022616b4a62377ea5e4ae9ba346 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Oct 2022 14:47:38 +0800
Subject: [PATCH] Merge branch 'score_shop'

---
 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
index 2be2912..177ca3d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java
@@ -39,7 +39,7 @@
 	 */
 	public int remove(List<Long> list);
 
-	public int cancelOrder(Long id);
+	public void cancelOrder(Long id);
 	/**
 	 * 根据id删除SysOrder
 	 *
@@ -145,4 +145,5 @@
 
 	BigDecimal findVipArrearsByVipId(Long vipId);
 
+    List<SysOrder> findByIds(List<Long> orderIds);
 }
\ No newline at end of file

--
Gitblit v1.9.1