From e9285f6e48b26bdd494569e660006ec87f3ad66b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 14:00:43 +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/redpack/RedPackDetail.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
index 75df9cc..f08f972 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
@@ -17,8 +17,8 @@
@Table("yeshi_red_pack_detail")
public class RedPackDetail {
public enum RedPackDetailTypeEnum {
- invite("绔嬪緱鐜伴噾", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
newUserReward("鏂颁汉濂栧姳", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ invite("绔嬪緱鐜伴噾", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
increaseReward("閫掑濂栧姳", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
seriesReward("杩炵画濂栧姳", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
refund("绾㈠寘閫�鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
@@ -29,10 +29,11 @@
giveOthers("绾㈠寘璧犻�佸緟棰嗗彇涓�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
giveOthersSucceed("绾㈠寘璧犻�侀鍙栨垚鍔�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
giveOthersFail("绾㈠寘璧犻�佽秴鏃堕��鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ giveOthersReceive("濂藉弸璧犻��", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
- redExchange("绾㈠寘鎻愮幇涓�", "http://img.flqapp.com/resource/money_detail/icon_score.png"),
- redExchangePass("绾㈠寘鎻愮幇鎴愬姛", "http://img.flqapp.com/resource/money_detail/icon_score.png"),
- redExchangeReject("绾㈠寘鎻愮幇澶辫触", "http://img.flqapp.com/resource/money_detail/icon_score.png");
+ redExchange("绾㈠寘鎻愮幇涓�", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
+ redExchangePass("绾㈠寘鎻愮幇鎴愬姛", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
+ redExchangeReject("绾㈠寘鎻愮幇澶辫触", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png");
private final String desc;
private final String picture;
--
Gitblit v1.8.0