Merge branch 'master-new' into div

yujian

2019-06-24 4c68642aad8889ff599af52d33453c483f13092a

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java

@@ -72,7 +72,7 @@
   public void updateApp(AcceptData acceptData, PrintWriter out) {

      Map<String, String> params = new HashMap<>();

      if ("android".equalsIgnoreCase(acceptData.getPlatform())) {// android更新

         acceptData.setVersion("10");

//         acceptData.setVersion("10");

         params.put("method", "update");

         params.put("Platform", "Android");

         params.put("Version", acceptData.getVersion());