Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-31 584e6a7781c3c3e53a517a6ffd8e97dbf2f737ba

 pom.xml

@@ -54,6 +54,7 @@
                <scope>import</scope>
            </dependency>
        </dependencies>

    </dependencyManagement>

    <dependencies>
@@ -211,6 +212,18 @@
            <classifier>jdk15</classifier>
        </dependency>

<!--        jap-->
<!--        <dependency>-->
<!--            <groupId>com.fujieid</groupId>-->
<!--            <artifactId>jap-simple</artifactId>-->
<!--            <version>1.0.5</version>-->
<!--        </dependency>-->
<!--        <dependency>-->
<!--            <groupId>xyz.dong6662.jap.spring.boot</groupId>-->
<!--            <artifactId>jap-spring-boot-starter-template</artifactId>-->
<!--            <version>1.0.0</version>-->
<!--        </dependency>-->

    </dependencies>

    <build>