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 |    6 +++---
 1 files changed, 3 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 43aff88..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,13 +27,13 @@
 
 	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("杩斿埄鎵i櫎",
 				"http://img.flqapp.com/resource/money_detail/icon_fanli.png",
 				"http://apph5.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
-		inviteWeiQuan("閭�璇峰閲戞墸闄�",
+		inviteWeiQuan("鍥㈤槦濂栭噾鎵i櫎",
 				"http://img.flqapp.com/resource/money_detail/icon_invite.png",
 				"http://apph5.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
 		shareWeiQuan("鍒嗕韩濂栭噾鎵i櫎",
@@ -57,7 +57,7 @@
 		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", ""),
-		orderTeamReward("鍥㈤槦濂栧姳", "http://img.flqapp.com/resource/msg/icon_msg_team_reward.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