From bc6df1cbd259c80539d11ae0107ccb938b570266 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 10:15:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTask.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTask.java b/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTask.java
index 2478660..25e6f6b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTask.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralTask.java
@@ -43,7 +43,7 @@
closeRecommendGoods("鍏抽棴鎺ㄨ崘鍟嗗搧"),couponRebate("鐐瑰嚮棰嗗埜杩斿埄"),couponRebateLevelOne("娴忚璐墿杞﹂〉"),couponRebateLevelTwo("娴忚璐墿杞﹂〉"),
rebateOrder("瀹屾垚杩斿埄璁㈠崟"),inviteOrderLevelOne("涓�绾ч槦鍛橀個璇疯鍗�"),inviteOrderLevelTwo("浜岀骇闃熷憳閭�璇疯鍗�"),shareOrder("鍒嗕韩璁㈠崟"),
bindWeiXin("寰俊鎺堟潈"),bindPhone("缁戝畾鎵嬫満"),bindTaoBao("娣樺疂鎺堟潈"), setWeiXinNum("娣诲姞寰俊鍙�"),setGender("棣栨璁剧疆鎬у埆"),
- setPortrait("棣栨淇敼澶村儚"), setNickname("淇敼鏄电О"),bindAlipay("缁戝畾鏀粯瀹�"),inviteActivate("婵�娲婚個璇�");
+ setPortrait("棣栨淇敼澶村儚"), setNickName("淇敼鏄电О"),bindAlipay("缁戝畾鏀粯瀹�"),inviteActivate("婵�娲婚個璇�");
private final String desc;
--
Gitblit v1.8.0