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/util/factory/msg/MsgInviteDetailFactory.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java
index 5228650..df74e90 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java
@@ -29,7 +29,7 @@
 		else
 			detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
-		detail.setDesc("鎭枩浣狅紝鎴愬姛閭�璇蜂竴涓槦鍛�");
+		detail.setDesc("鎭枩浣狅紝鎴愬姛閭�璇蜂竴涓矇涓�");
 		detail.setInviteUser(threeSale);
 		detail.setMsgType(MsgTypeInviteTypeEnum.invite);
 		detail.setRead(false);
@@ -52,7 +52,7 @@
 		detail.setUser(new UserInfo(uid));
 		detail.setInviteUser(threeSale);
 		detail.setMsgType(MsgTypeInviteTypeEnum.inviteSucceed);
-		detail.setDesc("闃熷憳锛堝ソ鍙嬶級鐔熺粌浣跨敤App鍙幏寰楃孩鍖�");
+		detail.setDesc("绮変笣锛堝ソ鍙嬶級鐔熺粌浣跨敤App鍙幏寰楃孩鍖�");
 		detail.setBeiZhu("婊¤冻鑾峰緱绾㈠寘鏉′欢鍚庣郴缁熷皢鑷姩涓嬪彂鍒扳�滄垜鐨�-绾㈠寘鈥濅腑");
 		detail.setCreateTime(new Date());
 		detail.setUpdateTime(new Date());
@@ -76,7 +76,7 @@
 		else
 			detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
-		detail.setDesc("鎭枩浣狅紝鏈夋柊闃熷憳鍔犲叆浣犵殑闃熷垪锛岃嫢瀵规柟60澶╁唴鏈縺娲诲皢浼氫笌浣犺劚绂婚個璇峰叧绯�");
+		detail.setDesc("鎭枩浣狅紝鏈夋柊绮変笣鍔犲叆浣犵殑闃熷垪锛岃嫢瀵规柟60澶╁唴鏈縺娲诲皢浼氫笌浣犺劚绂婚個璇峰叧绯�");
 		detail.setInviteUser(threeSale);
 		detail.setMsgType(MsgTypeInviteTypeEnum.invite);
 		detail.setRead(false);
@@ -104,7 +104,7 @@
 		else
 			detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
-		detail.setDesc("鎶辨瓑锛岃闃熷憳鍥�60澶╁唴鏈縺娲伙紝宸茶劚绂讳簡浣犵殑闃熷垪锛屽彲浠ヨ瘯鐫�閲嶆柊閭�璇�");
+		detail.setDesc("鎶辨瓑锛岃绮変笣鍥�60澶╁唴鏈縺娲伙紝宸茶劚绂讳簡浣犵殑闃熷垪锛屽彲浠ヨ瘯鐫�閲嶆柊閭�璇�");
 		detail.setInviteUser(threeSale);
 		detail.setMsgType(MsgTypeInviteTypeEnum.invite);
 		detail.setRead(false);

--
Gitblit v1.8.0