Merge remote-tracking branch 'origin/master'

admin

2018-12-05 21f49216736c547d99ec1dd46a24c6f43f852fc5

Merge remote-tracking branch 'origin/master'

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