From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
index 5904c41..015db63 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
@@ -253,7 +253,7 @@
return;
orderId = orderId.substring(0, orderId.length() - 6) + "******";
try {
- pushService.pushZNX(uid, Constant.znxConfig.getShareOrderStatisticedMsg(), Constant.znxConfig
+ pushService.pushZNX(uid, Constant.znxConfig.getShareOrderStatisticedTitle(), Constant.znxConfig
.getShareOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()));
} catch (PushException e) {
e.printStackTrace();
--
Gitblit v1.8.0