From 83bb6e0580b646c5d89da1cdb4085787c8136822 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 23 四月 2020 14:29:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 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 5ec20aa..42d5602 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
@@ -5,6 +5,7 @@
 import java.util.List;
 
 import com.yeshi.fanli.dto.HongBaoDTO;
+import com.yeshi.fanli.dto.order.HongBaoAddResult;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.exception.order.HongBaoException;
@@ -34,7 +35,7 @@
 	 * @return 0-鏈坊鍔犱篃鏈洿鏂� 1-鍙坊鍔� 2-鍙洿鏂� 12-鏈夋坊鍔犱篃鏈夋洿鏂�
 	 * @throws HongBaoException
 	 */
-	public int addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException,UserAccountException ;
+	public HongBaoAddResult addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException,UserAccountException ;
 
 	/**
 	 * 濂栭噾鍒楄〃锛�1.4.9涔嬪墠鐨勭増鏈級

--
Gitblit v1.8.0