six-vehicle
/
cloud-server
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud-modules/cloud-modules-fault/pom.xml
View File

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

4
cloud-weixin-mp/pom.xml
View File

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