提交 169f1b83 authored 作者: 吕本才's avatar 吕本才

Merge remote-tracking branch 'origin/master'

# Conflicts: # pom.xml
......@@ -46,10 +46,13 @@
<transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
<mysql-connector-java.version>8.0.33</mysql-connector-java.version>
<druid-spring-boot-starter.version>1.2.19</druid-spring-boot-starter.version>
<spring-boot-start-test.version>2.7.0</spring-boot-start-test.version>
<mybatis-plus.version>3.4.0</mybatis-plus.version>
<hutool-all.version>5.5.0</hutool-all.version>
<xxl-job.version>2.4.0</xxl-job.version>
<oapi-sdk.version>2.4.4</oapi-sdk.version>
<junit.version>4.13.2</junit.version>
<okhttp.version>4.12.0</okhttp.version>
<easyexcel.version>3.2.0</easyexcel.version>
</properties>
......@@ -313,7 +316,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.7.0</version>
<version>${spring-boot-start-test.version}</version>
<scope>test</scope>
</dependency>
......@@ -322,7 +325,14 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<version>4.13.2</version>
<version>${junit.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
</dependency>
</dependencies>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论