From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
pom.xml | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4ec5445..2b980b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,12 +45,17 @@
<hutool.version>5.8.18</hutool.version>
<easyexcel.version>3.3.2</easyexcel.version>
<poi.tl.version>1.12.2</poi.tl.version>
+ <amqp.version>3.2.6</amqp.version>
</properties>
<!-- 渚濊禆澹版槑 -->
<dependencyManagement>
<dependencies>
-
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-amqp</artifactId>
+ <version>${amqp.version}</version>
+ </dependency>
<!-- 瑕嗙洊SpringFramework鐨勪緷璧栭厤缃�-->
<dependency>
<groupId>org.springframework</groupId>
@@ -198,20 +203,6 @@
<groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
- </dependency>
-
- <!-- 瀹氭椂浠诲姟-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
- <version>${ruoyi.version}</version>
- </dependency>
-
- <!-- 浠ｇ爜鐢熸垚-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-generator</artifactId>
- <version>${ruoyi.version}</version>
</dependency>
<!-- 鏍稿績妯″潡-->
@@ -398,16 +389,15 @@
<module>ruoyi-admin</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
- <module>ruoyi-quartz</module>
- <module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>basic-server</module>
<module>inspect-server</module>
<module>performance-server</module>
<module>cnas-manage</module>
+ <module>cnas-device</module>
<module>cnas-process</module>
<module>cnas-require</module>
- <module>cnas-device</module>
+ <module>cnas_server</module>
<module>cnas-personnel</module>
</modules>
<packaging>pom</packaging>
--
Gitblit v1.9.3