Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

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