From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java
index 135dc2c..ef4fe91 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoV2Service.java
@@ -8,6 +8,7 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.exception.order.HongBaoException;
+import com.yeshi.fanli.exception.user.UserAccountException;
public interface HongBaoV2Service {
@@ -33,7 +34,7 @@
* @return 0-鏈坊鍔犱篃鏈洿鏂� 1-鍙坊鍔� 2-鍙洿鏂� 12-鏈夋坊鍔犱篃鏈夋洿鏂�
* @throws HongBaoException
*/
- public int addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException;
+ public int addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException,UserAccountException ;
/**
* 濂栭噾鍒楄〃锛�1.4.9涔嬪墠鐨勭増鏈級
--
Gitblit v1.8.0