From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决
---
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 79e8c19..d7edce4 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
@@ -22,7 +22,7 @@
share("鍒嗕韩濂栭噾", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png", ""), invite("閭�璇峰閲�", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_invite.png", ""), inviteAndShare("濂栭噾鏀跺叆", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png", ""), fanli("杩斿埄鍒拌处", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png",
""), fanliWeiQuan("杩斿埄鎵ｉ櫎", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), inviteWeiQuan("閭�璇峰閲戞墸闄�", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_invite.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_share.png",
"http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), weiQuan("鍞悗璁㈠崟鎵ｆ", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), systemEqualize("绯荤粺琛ラ綈", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_system.png", ""), scoreConvert("绉垎鍏戞崲", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_score.png",
- ""), hongbao("瀹樻柟绾㈠寘", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), hongbaoDeduct("绾㈠寘閫�娆�", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png",
+ ""), hongbao("瀹樻柟绾㈠寘", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png", ""), hongbaoDeduct("绾㈠寘閫�娆�", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_hongbao.png",
""), buyScore("璐拱绉垎", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_score.png", ""), extract("鎻愮幇", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_extract.png",
""), extractVerify("鎻愮幇楠岃瘉", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_extract.png", ""), extractReject("鎻愮幇琚嫆", "http://ec-1255749512.file.myqcloud.com/resource/money_detail/icon_extract.png", "");
private final String desc;
--
Gitblit v1.8.0