Merge branch 'master' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -406,7 +406,7 @@ public class SettlementOrderLogic {
 
         workerOrders.addAll(workerOrderService.lambdaQuery()
                 .eq(WorkerOrder::getPayState, IsYesNoEnum.YES.getKey())
-                .ge(WorkerOrder::getPayStateTime, DateUtil.offsetMinute(new Date(),-20))
+                .le(WorkerOrder::getPayStateTime, DateUtil.offsetMinute(new Date(),-20))
                 .ne(WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey())
                 .le(WorkerOrder::getPayNum, 11)
                 .list());