From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackWinInvite.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackWinInvite.java b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackWinInvite.java
index 6848540..6a4dd4c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackWinInvite.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackWinInvite.java
@@ -16,9 +16,9 @@
public class RedPackWinInvite {
public enum RedPackWinInviteTypeEnum {
newUserReward("棣栨浣跨敤鏉挎牀蹇渷鏂颁汉濂栧姳"),
- inviteSucceed("鎴愬姛閭�璇峰ソ鍙嬬珛寰楃幇閲�"),
- firstSharedOrder("瀹屾垚鍒嗕韩璁㈠崟閫掑濂栧姳"),
- monthSharedOrder("瀹屾垚鍒嗕韩璁㈠崟杩炵画濂栧姳");
+ oneStageReward("鎴愬姛閭�璇峰ソ鍙嬬珛寰楃幇閲�"),
+ twoStageReward("瀹屾垚鍒嗕韩璁㈠崟閫掑濂栧姳"),
+ threeStageReward("瀹屾垚鍒嗕韩璁㈠崟杩炵画濂栧姳");
private final String desc;
--
Gitblit v1.8.0