From c721a20b654dc86625d95929b3d55b99083bd264 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 三月 2019 16:23:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMapServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMapServiceImpl.java
index 936ddc5..37fe52d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMapServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMapServiceImpl.java
@@ -2,7 +2,6 @@
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.Map;
 
 import javax.annotation.Resource;
 
@@ -35,7 +34,7 @@
 	
 	
 	@Override
-	public Map<String,BigDecimal> getCouponHongbaoByOrderNo(String orderNo, Long uid) {
+	public BigDecimal getCouponHongbaoByOrderNo(String orderNo, Long uid) {
 		return  orderHongBaoMapMapper.getCouponHongbaoByOrderNo(orderNo, uid);
 	}
 }

--
Gitblit v1.8.0