Merge remote-tracking branch 'origin/div' into div

admin

2020-04-15 d4588f4e43336b26b356b869c29d0c76390167d5

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

@@ -74,6 +74,8 @@


   @RequestMapping(value = "updateApp")

   public void updateApp(AcceptData acceptData, PrintWriter out) {

      if (Constant.IS_TEST)

         acceptData.setVersion("20");

      String result = appUpdateManager.getUpdateInfoCache(acceptData);

      try {

         out.print(new String(result.getBytes("ISO-8859-1"), "UTF-8"));