From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 7 ++++++-
1 files changed, 6 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 f2792c4..d9679e6 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,8 +34,13 @@
subSidy("棰濆琛ヨ创"),
redPackGiveOff("璧犻�佺孩鍖呭畬鎴�"),
redPackReceiveOff("璧犻�佺孩鍖呴鍙�"),
+ redPackGiveBack("绾㈠寘閫�鍥�"),
redPackExchangePass("绾㈠寘鎻愮幇鎴愬姛"),
- redPackExchangeReject("绾㈠寘鎻愮幇澶辫触");
+ redPackExchangeReject("绾㈠寘鎻愮幇澶辫触"),
+ redPackNewUserReward("鏂颁汉濂栧姳-瀹屾垚棣栫瑪璁㈠崟"),
+ redPackInviteSucceed("绔嬪緱鐜伴噾-鎴愬姛閭�璇峰ソ鍙�"),
+ redPackFirstSharedOrder("閫掑濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
+ redPackMonthSharedOrder("杩炵画濂栧姳-濂藉弸瀹屾垚璁㈠崟");
private final String desc;
--
Gitblit v1.8.0