From 21f49216736c547d99ec1dd46a24c6f43f852fc5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 05 十二月 2018 10:37:31 +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 82d1322..33ed1b2 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
@@ -270,7 +270,7 @@
 					result.put("picture", picture);
 
 					String fontColor1 = "#666666";
-					String fontColor2 = "#e5005c";
+					String fontColor2 = "#E5005C";
 					JSONArray array = new JSONArray();
 					
 

--
Gitblit v1.8.0