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

admin

2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10

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

@@ -105,6 +105,11 @@
   }



   private List<DeviceTokenOPPO> filterDeviceToken(List<DeviceTokenOPPO> deviceList, int hour) {



      // TODO 消息免打扰关闭

      if (1 > 0)

         return deviceList;



      // 处理消息免打扰

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

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