cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into v3.3

Browse Source 
# Conflicts:
#	yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
This commit is contained in:
taozi
2022-05-01 19:33:51 +08:00
parent 7328c454e8 dd8b49752b
commit 4f8f096cb2
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -253,6 +253,13 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>${gson.version}</version> <version>${gson.version}</version>
</dependency> </dependency>
<!--由于>=jdk9中不再包含这个jar包,导致登陆报错,需手动引入-->
<!-- <dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>-->
</dependencies> </dependencies>
<build> <build>

1
yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
View File

@ -157,7 +157,6 @@ public class StoreSeckillController {
} }
list.add(seckillTimeDto); list.add(seckillTimeDto);
}); });
List<SeckillTimeDto> seckillTimeDtoList = list.stream() List<SeckillTimeDto> seckillTimeDtoList = list.stream()
.sorted(Comparator.comparing(SeckillTimeDto::getTime)) .sorted(Comparator.comparing(SeckillTimeDto::getTime))
.collect(Collectors.toList()); .collect(Collectors.toList());