From 3f7c35dcb3bd703fcb952bb1a7d3ba5088d87b54 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 30 十月 2019 15:13:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
index 75df9cc..6fc4e3d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
@@ -29,10 +29,11 @@
 		giveOthers("绾㈠寘璧犻�佸緟棰嗗彇涓�", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
 		giveOthersSucceed("绾㈠寘璧犻�侀鍙栨垚鍔�", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
 		giveOthersFail("绾㈠寘璧犻�佽秴鏃堕��鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
+		giveOthersReceive("濂藉弸璧犻��", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
 		
-		redExchange("绾㈠寘鎻愮幇涓�", "http://img.flqapp.com/resource/money_detail/icon_score.png"),
-		redExchangePass("绾㈠寘鎻愮幇鎴愬姛", "http://img.flqapp.com/resource/money_detail/icon_score.png"),
-		redExchangeReject("绾㈠寘鎻愮幇澶辫触", "http://img.flqapp.com/resource/money_detail/icon_score.png");
+		redExchange("绾㈠寘鎻愮幇涓�", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
+		redExchangePass("绾㈠寘鎻愮幇鎴愬姛", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
+		redExchangeReject("绾㈠寘鎻愮幇澶辫触", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png");
 
 		private final String desc;
 		private final String picture;

--
Gitblit v1.8.0