Merge branch 'master' of E:\mn\pqs with conflicts.

This commit is contained in:
wurui
2023-02-13 09:33:18 +08:00
parent fd9edd3225
commit 2f16b68ba5
7 changed files with 317 additions and 251 deletions

View File

@@ -19,18 +19,18 @@
</properties>
<dependencies>
<!-- <dependency>-->
<!-- <groupId>com.njcn</groupId>-->
<!-- <artifactId>pq-device-boot</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.njcn</groupId>
<artifactId>pms-device-boot</artifactId>
<artifactId>pq-device-boot</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.njcn</groupId>-->
<!-- <artifactId>pms-device-boot</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.njcn</groupId>
<artifactId>common-swagger</artifactId>