From 3a6e476b2f498e876ff10f1328455f58e63ee85a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 04 四月 2019 09:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 0513dd1..6655d9d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -1309,11 +1309,11 @@
 	 *            鐢ㄦ埛鍐嶆鍒嗘垚姣斾緥锛�0-100锛�
 	 * @return
 	 */
-	public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
+	public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
 		if (goodsBrief != null && goodsBrief.getMaterialLibType() != null && goodsBrief.getMaterialLibType() == 0)
 			return "楼0.00";
-		else
-			return "楼" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
+		else
+			return "楼" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
 	}
 
 	/**

--
Gitblit v1.8.0