Merge branch 'master' into div

yujian

2019-07-11 1510301f5673631ad24fb5634bff5d504eda5ccd

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java

@@ -124,7 +124,7 @@
         JSONObject json = new JSONObject();

         json.put("type", "ZNX");

         json.put("content", contentJson);

         json.put("miPushUrl", String.format("%s.ui.mine.AppMailDetailActivity",

         json.put("miPushUrl", String.format("%s.ui.main.MainActivity",

               Constant.systemCommonConfig.getAndroidBaseactivityName()));



         // 版本推送

@@ -158,7 +158,7 @@
         JSONObject json = new JSONObject();

         json.put("type", "ZNX");

         json.put("content", contentJson);

         json.put("miPushUrl", String.format("%s.ui.mine.AppMailDetailActivity",

         json.put("miPushUrl", String.format("%s.ui.main.MainActivity",

               Constant.systemCommonConfig.getAndroidBaseactivityName()));



         // 版本推送