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/service/impl/user/invite/MsgInviteDetailServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/MsgInviteDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/MsgInviteDetailServiceImpl.java
index ab32989..83f0c62 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/MsgInviteDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/MsgInviteDetailServiceImpl.java
@@ -45,12 +45,12 @@
update.setId(oldDetail.getId());
if (!detail.getInviteUser().getState()) {
if (detail.getInviteUser().getExpire() == ThreeSale.EXPIRE_NORMAL) {
- update.setDesc("鎭枩浣狅紝鏈夋柊闃熷憳鍔犲叆浣犵殑闃熷垪锛岃嫢瀵规柟60澶╁唴鏈縺娲诲皢浼氫笌浣犺劚绂婚個璇峰叧绯�");
+ update.setDesc("鎭枩浣狅紝鏈夋柊绮変笣鍔犲叆浣犵殑闃熷垪锛岃嫢瀵规柟60澶╁唴鏈縺娲诲皢浼氫笌浣犺劚绂婚個璇峰叧绯�");
} else {
- update.setDesc("鎶辨瓑锛岃闃熷憳鍥�60澶╁唴鏈縺娲伙紝宸茶劚绂讳簡浣犵殑闃熷垪锛屽彲浠ヨ瘯鐫�閲嶆柊閭�璇�");
+ update.setDesc("鎶辨瓑锛岃绮変笣鍥�60澶╁唴鏈縺娲伙紝宸茶劚绂讳簡浣犵殑闃熷垪锛屽彲浠ヨ瘯鐫�閲嶆柊閭�璇�");
}
} else {
- update.setDesc("鎭枩浣狅紝鎴愬姛閭�璇蜂竴涓槦鍛�");
+ update.setDesc("鎭枩浣狅紝鎴愬姛閭�璇蜂竴涓矇涓�");
}
update.setUpdateTime(new Date());
update.setRead(false);
--
Gitblit v1.8.0