Merge branch 'dev1'

Administrator

2018-12-04 4d6d0dfe586077c44e70318d5500cf35b92b0d49

 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);