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/pom.xml
+++ b/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>