From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index 9f8b373..9cbbb53 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -246,7 +246,7 @@
 	 * @param orderNo
 	 * @return
 	 */
-	public JSONObject getRewardJumpInfo(String orderNo);
+	public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType);
 
 	/**
 	 * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯�

--
Gitblit v1.8.0