From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
index 117c495..7ecc821 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
@@ -37,10 +37,9 @@
redPackGiveBack("绾㈠寘閫�鍥�"),
redPackExchangePass("绾㈠寘鎻愮幇鎴愬姛"),
redPackExchangeReject("绾㈠寘鎻愮幇澶辫触"),
- redPackNewUserReward("鏂颁汉濂栧姳-瀹屾垚棣栫瑪璁㈠崟"),
- redPackInviteSucceed("绔嬪緱鐜伴噾-鎴愬姛閭�璇峰ソ鍙�"),
- redPackFirstSharedOrder("閫掑濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
- redPackMonthSharedOrder("杩炵画濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
+ redPackOneStageReward("绗竴闃舵-绔嬪緱鐜伴噾-鎴愬姛閭�璇峰ソ鍙�"),
+ redPackTwoStageReward("绗簩闃舵-閫掑濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
+ redPackThreeStageReward("绗笁闃舵-杩炵画濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
redPackUseSuccess("绾㈠寘浣跨敤鎴愬姛"),
redPackUseFail("绾㈠寘浣跨敤澶辫触");
--
Gitblit v1.8.0