Merge branch 'master' into v3.3

# Conflicts:
#	yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java

pom.xml

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

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());