From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 75b27a9..117c495 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
@@ -34,12 +34,15 @@
subSidy("棰濆琛ヨ创"),
redPackGiveOff("璧犻�佺孩鍖呭畬鎴�"),
redPackReceiveOff("璧犻�佺孩鍖呴鍙�"),
+ redPackGiveBack("绾㈠寘閫�鍥�"),
redPackExchangePass("绾㈠寘鎻愮幇鎴愬姛"),
redPackExchangeReject("绾㈠寘鎻愮幇澶辫触"),
redPackNewUserReward("鏂颁汉濂栧姳-瀹屾垚棣栫瑪璁㈠崟"),
redPackInviteSucceed("绔嬪緱鐜伴噾-鎴愬姛閭�璇峰ソ鍙�"),
redPackFirstSharedOrder("閫掑濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
- redPackMonthSharedOrder("杩炵画濂栧姳-濂藉弸瀹屾垚璁㈠崟");
+ redPackMonthSharedOrder("杩炵画濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
+ redPackUseSuccess("绾㈠寘浣跨敤鎴愬姛"),
+ redPackUseFail("绾㈠寘浣跨敤澶辫触");
private final String desc;
--
Gitblit v1.8.0