From 616608ec1005bff373bc380ecc3bf02a1063497c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:42:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinOrigin.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinOrigin.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinOrigin.java
index 3cbf866..b8aff69 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinOrigin.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinOrigin.java
@@ -17,7 +17,7 @@
public enum TaoLiJinOriginEnum {
newbiesWin("鏂颁汉绾㈠寘"), shareWin("鎺ㄥ箍绾㈠寘绂忓埄"), rankWin("璐︽埛绛夌骇绂忓埄"), inviteWin("閭�璇烽槦鍛樺鍔�"),
- refund("鏈鍙栭��鍥�"), exchange("閲戝竵鍏戞崲");
+ refund("鏈鍙栭��鍥�"), exchange("閲戝竵鍏戞崲"), friendsGive("濂藉弸璧犻��"), giveSendBack("璧犻�侀��鍥�");
private final String desc;
--
Gitblit v1.8.0