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/entity/money/UserMoneyDetail.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 003f9ae..60c8b91 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
@@ -31,9 +31,11 @@
"http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), weiQuan("鍞悗璁㈠崟鎵ｆ", "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("閲嶅缁熻杩斿埄/濂栭噾鎵ｉ櫎","http://img.flqapp.com/resource/money_detail/icon_fanli.png",""),
- extractAutoWX("鑷姩鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""), extractAutoWXRefund("鑷姩鎻愮幇澶辫触", "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("閲嶅缁熻杩斿埄/濂栭噾鎵ｉ櫎","http://img.flqapp.com/resource/money_detail/icon_fanli.png",""),
+ elmeFanli("楗夸簡涔堣繑鍒╁埌璐�","http://img.flqapp.com/resource/money_detail/icon_fanli.png",""),
+ extractAutoWX("鑷姩鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""), extractAutoWXRefund("鑷姩鎻愮幇澶辫触", "http://img.flqapp.com/resource/money_detail/icon_extract.png", "");
+
+
private final String desc;
private final String picture;
private final String helpUrl;
--
Gitblit v1.8.0