Merge branch 'master' into v3.3

# Conflicts: # yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
2022-05-01 19:33:51 +08:00
parent 7328c454e8 dd8b49752b
commit 4f8f096cb2
2 changed files with 7 additions and 1 deletions
--- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
@ -157,7 +157,6 @@ public class StoreSeckillController {
            }
            list.add(seckillTimeDto);
        });
-
        List<SeckillTimeDto> seckillTimeDtoList = list.stream()
                .sorted(Comparator.comparing(SeckillTimeDto::getTime))
                .collect(Collectors.toList());