From 217e39bec2ae2a861c4619d277ab0bc823cf85d4 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 28 二月 2025 11:41:35 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev

---
 ruoyi-admin/pom.xml |   49 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index a63e7aa..485e28d 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -17,12 +17,12 @@
 
     <dependencies>
 
-        <!-- spring-boot-devtools -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 琛ㄧず渚濊禆涓嶄細浼犻�� -->
-        </dependency>
+<!--        &lt;!&ndash; spring-boot-devtools &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-devtools</artifactId>-->
+<!--            <optional>true</optional> &lt;!&ndash; 琛ㄧず渚濊禆涓嶄細浼犻�� &ndash;&gt;-->
+<!--        </dependency>-->
 
         <!-- swagger3-->
         <dependency>
@@ -43,6 +43,7 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <!-- 閫氱敤宸ュ叿-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
@@ -60,39 +61,55 @@
             <artifactId>ruoyi-quartz</artifactId>
         </dependency>
 
-        <!-- 浠ｇ爜鐢熸垚-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-generator</artifactId>
-        </dependency>
-
         <!--鍩虹妯″潡-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>basic-server</artifactId>
-            <version>${ruoyi.version}</version>
         </dependency>
 
         <!--涓氬姟妯″潡-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>inspect-server</artifactId>
-            <version>${ruoyi.version}</version>
         </dependency>
 
         <!--缁╂晥妯″潡-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>performance-server</artifactId>
-            <version>${ruoyi.version}</version>
         </dependency>
 
+        <!--cnas鏍囧噯鐗╄川-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>cnas-require</artifactId>
-            <version>${ruoyi.version}</version>
         </dependency>
 
+        <!--cnas浣撶郴绠＄悊瑕佹眰-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>cnas-manage</artifactId>
+        </dependency>
+
+        <!--cnas璁惧绠＄悊-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>cnas-device</artifactId>
+        </dependency>
+
+        <!--cnas璧勬簮瑕佹眰-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>cnas-process</artifactId>
+        </dependency>
+
+        <!--cnas浜哄憳-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>cnas-personnel</artifactId>
+        </dependency>
+
+
     </dependencies>
 
     <build>

--
Gitblit v1.9.3