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

admin

2020-01-03 1e4e20573dfc917e7b43068da35ee532a192aacd

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

@@ -43,7 +43,7 @@
         return;

      }



      AppPageNotification ap = appPageNotificationService.getAppPageNotificationByTypeCache(type);

      AppPageNotification ap = appPageNotificationService.getValidNotificationByTypeCache(type);

      if ("home".equalsIgnoreCase(type)

            && VersionUtil.smallerThan_1_5_1(acceptData.getPlatform(), acceptData.getVersion()) && ap != null) {

         AppPageNotification no = new AppPageNotification();