From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-personnel/pom.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/cnas-personnel/pom.xml b/cnas-personnel/pom.xml
index 6b94b71..3a630d5 100644
--- a/cnas-personnel/pom.xml
+++ b/cnas-personnel/pom.xml
@@ -40,6 +40,17 @@
<groupId>com.ruoyi</groupId>
<artifactId>inspect-server</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>cnas-process</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.belerweb</groupId>
+ <artifactId>pinyin4j</artifactId>
+ <version>2.5.1</version>
+ </dependency>
</dependencies>
</project>
--
Gitblit v1.9.3