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

yujian

2020-05-18 607ce2c2ae229176f4a8a4171088f73729ef4567

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

@@ -105,6 +105,9 @@
   }



   private List<DeviceTokenHW> filterDeviceToken(List<DeviceTokenHW> hwDeviceList, int hour) {

      // TODO 暂时不处理消息免打扰

      if (1 > 0)

         return hwDeviceList;

      // 处理消息免打扰

      if (hour >= 20 || hour < 8) {

         Set<Long> uidSets = new HashSet<>();