From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 305c6dc..c7a237f 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
@@ -27,21 +27,21 @@
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", ""),
+ 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("杩斿埄鎵ｉ櫎",
"http://img.flqapp.com/resource/money_detail/icon_fanli.png",
- "http://apph5.yeshitv.com/AppPage/1.8.0/all_help_content.html?id=214"),
- inviteWeiQuan("閭�璇峰閲戞墸闄�",
+ "http://apph5.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
+ inviteWeiQuan("鍥㈤槦濂栭噾鎵ｉ櫎",
"http://img.flqapp.com/resource/money_detail/icon_invite.png",
- "http://apph5.yeshitv.com/AppPage/1.8.0/all_help_content.html?id=214"),
+ "http://apph5.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎",
"http://img.flqapp.com/resource/money_detail/icon_share.png",
- "http://apph5.yeshitv.com/AppPage/1.8.0/all_help_content.html?id=214"),
+ "http://apph5.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
weiQuan("鍞悗璁㈠崟鎵ｆ",
"http://img.flqapp.com/resource/money_detail/icon_fanli.png",
- "http://apph5.yeshitv.com/AppPage/1.8.0/all_help_content.html?id=214"),
+ "http://apph5.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
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", ""),
@@ -53,9 +53,11 @@
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", ""),
+ redPackExchange("绾㈠寘鎻愮幇鍒颁綑棰�", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png", ""),
extractAutoWX("鑷姩鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),
extractAutoWXRefund("鑷姩鎻愮幇澶辫触", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),
- subsidy("棰濆琛ヨ创", "http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", "");
+ subsidy("棰濆琛ヨ创", "http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", ""),
+ orderTeamDividents("鍥㈤槦鍒嗙孩", "http://img.flqapp.com/resource/msg/icon_msg_team_reward.png", "");
private final String desc;
private final String picture;
--
Gitblit v1.8.0