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/redpack/RedPackDetail.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 c3a928e..29d4e6a 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,20 +17,18 @@
@Table("yeshi_red_pack_detail")
public class RedPackDetail {
public enum RedPackDetailTypeEnum {
+ refund("绾㈠寘閫�鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ violation("绾㈠寘娑夊珜杩濊", "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"),
- videoRecharge("瑙嗛浼氬憳鍏呭��", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
- musicRecharge("闊充箰浼氬憳鍏呭��", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
- violation("绾㈠寘娑夊珜杩濊", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
-
giveOthers("绾㈠寘璧犻�佸緟棰嗗彇涓�", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
giveOthersSucceed("绾㈠寘璧犻�侀鍙栨垚鍔�", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
giveOthersFail("绾㈠寘璧犻�佽秴鏃堕��鍥�", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
giveOthersReceive("濂藉弸璧犻��", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
-
+ useByShopOrder("鍟嗗煄璁㈠崟浣跨敤", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
+ shopOrderDrawBack("鍟嗗煄璁㈠崟閫�鍥�", "http://img.flqapp.com/img/tlj/icon_tlj.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");
@@ -46,7 +44,7 @@
public String getDesc() {
return desc;
}
-
+
public String getPicture() {
return picture;
}
--
Gitblit v1.8.0