From 35234960ed0b084e781946d0646f2371d8a93789 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期一, 03 十二月 2018 17:52:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
index 1589e60..0454fef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
@@ -277,7 +277,7 @@
JSONObject contentJson1 = new JSONObject();
contentJson1.put("color", fontColor1);
- contentJson1.put("content", "鏈鎺ㄩ�佸叡");
+ contentJson1.put("content", "鏈鎺ㄨ崘鍏�");
JSONObject contentJson2 = new JSONObject();
contentJson2.put("color", fontColor2);
--
Gitblit v1.8.0