From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-process/pom.xml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/cnas-process/pom.xml b/cnas-process/pom.xml
index 70ecba8..c5c39bf 100644
--- a/cnas-process/pom.xml
+++ b/cnas-process/pom.xml
@@ -18,9 +18,25 @@
<dependencies>
<!--涓氬姟妯″潡-->
+<!-- <dependency>-->
+<!-- <groupId>com.ruoyi</groupId>-->
+<!-- <artifactId>inspect-server</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>inspect-server</artifactId>
+ <artifactId>ruoyi-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>performance-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.deepoove</groupId>
+ <artifactId>poi-tl</artifactId>
</dependency>
<dependency>
--
Gitblit v1.9.3