From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
index e998a1e..5748e5d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
@@ -28,7 +28,7 @@
 	public enum UserMoneyDetailTypeEnum {
 		share("鍒嗕韩濂栭噾", "http://img.flqapp.com/resource/money_detail/icon_share.png", ""), invite("閭�璇峰閲�", "http://img.flqapp.com/resource/money_detail/icon_invite.png", ""), inviteAndShare("濂栭噾鏀跺叆", "http://img.flqapp.com/resource/money_detail/icon_share.png", ""), fanli("杩斿埄鍒拌处", "http://img.flqapp.com/resource/money_detail/icon_fanli.png",
 				""), fanliWeiQuan("杩斿埄鎵i櫎", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), inviteWeiQuan("閭�璇峰閲戞墸闄�", "http://img.flqapp.com/resource/money_detail/icon_invite.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), shareWeiQuan("鍒嗕韩濂栭噾鎵i櫎", "http://img.flqapp.com/resource/money_detail/icon_share.png",
-						"http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), weiQuan("鍞悗璁㈠崟鎵f", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), systemEqualize("绯荤粺琛ラ綈", "http://img.flqapp.com/resource/money_detail/icon_system.png", ""), scoreConvert("绉垎鍏戞崲", "http://img.flqapp.com/resource/money_detail/icon_score.png",
+						"http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), weiQuan("鍞悗璁㈠崟鎵f", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), systemEqualize("绯荤粺琛ラ綈", "http://img.flqapp.com/resource/money_detail/icon_system.png", ""), scoreConvert("閲戝竵鍏戞崲", "http://img.flqapp.com/resource/money_detail/icon_score.png",
 								""), hongbao("瀹樻柟绾㈠寘", "http://img.flqapp.com/resource/money_detail/icon_hongbao.png", ""), hongbaoDeduct("绾㈠寘閫�娆�", "http://img.flqapp.com/resource/money_detail/icon_hongbao.png",
 										""), buyScore("璐拱绉垎", "http://img.flqapp.com/resource/money_detail/icon_score.png", ""), extract("鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_extract.png",
 												""), extractVerify("鎻愮幇楠岃瘉", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""), extractReject("鎻愮幇琚嫆", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),orderReward("杩斿埄濂栧姳","http://img.flqapp.com/resource/money_detail/icon_order_reward.png",""),repeatStatistic("閲嶅缁熻杩斿埄/濂栭噾鎵i櫎","http://img.flqapp.com/resource/money_detail/icon_fanli.png","");

--
Gitblit v1.8.0