From e57271b299b6568fd00e8046b79befbb1f224d2c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 14 五月 2019 15:06:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMapService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMapService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMapService.java
index 0ae9216..6b2d561 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMapService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderHongBaoMapService.java
@@ -28,6 +28,6 @@
 	 * @param uid
 	 * @return
 	 */
-	public Map<String, BigDecimal> getCouponHongbaoByOrderNo(String orderNo, Long uid);
+	public BigDecimal getCouponHongbaoByOrderNo(String orderNo, Long uid);
 
 }

--
Gitblit v1.8.0