From 59aced4fe04f7e2fdcca81cb9ef279a70522301e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:30:44 +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/integral/IntegralTask.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 f703830..7a30326 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
@@ -53,8 +53,8 @@
giveFreeCoupon("璧犻�佸厤鍗曞埜"),
giveTaoLiJin("璧犻�佹帹骞跨孩鍖�"),
inShop("娴忚搴楅摵"),
- inShopLevelOne("涓�绾ч槦鍛樻祻瑙堝簵閾�"),
- inShopLevelTwo("浜岀骇闃熷憳娴忚搴楅摵"),
+ inShopLevelOne("鐩存帴绮変笣娴忚搴楅摵"),
+ inShopLevelTwo("绠�浠嬬矇涓濇祻瑙堝簵閾�"),
scanPush("娴忚鎺ㄨ崘璁板綍"),
scanGoods("娴忚鍟嗗搧璇︽儏椤�"),
scanSearchResult("娴忚鎼滅储缁撴灉椤�"),
@@ -66,8 +66,8 @@
couponRebateLevelOne("娴忚璐墿杞﹂〉"),
couponRebateLevelTwo("娴忚璐墿杞﹂〉"),
rebateOrder("瀹屾垚杩斿埄璁㈠崟"),
- inviteOrderLevelOne("涓�绾ч槦鍛橀個璇疯鍗�"),
- inviteOrderLevelTwo("浜岀骇闃熷憳閭�璇疯鍗�"),
+ inviteOrderLevelOne("鐩存帴绮変笣閭�璇疯鍗�"),
+ inviteOrderLevelTwo("闂存帴绮変笣閭�璇疯鍗�"),
shareOrder("鍒嗕韩璁㈠崟"),
bindWeiXin("寰俊鎺堟潈"),
bindPhone("缁戝畾鎵嬫満"),
--
Gitblit v1.8.0