fix(): 解决代码冲突

dev.vehicleGateway
15285 2024-09-26 10:17:53 +08:00
parent aa1d518628
commit f19b18d273
2 changed files with 4 additions and 2 deletions

View File

@ -72,12 +72,14 @@
<groupId>com.muyu</groupId>
<artifactId>cloud-common-api-doc</artifactId>
</dependency>
<dependency>
<groupId>com.carrotsearch.thirdparty</groupId>
<artifactId>simple-xml-safe</artifactId>
<version>2.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.attoparser</groupId>
<artifactId>attoparser</artifactId>

View File

@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.muyu</groupId>
<artifactId>cloud-server-parent</artifactId>
<version>3.6.4</version>
<artifactId>cloud-server</artifactId>
<version>3.6.3</version>
<relativePath></relativePath>
</parent>