From 7a838ed69de1d9593fe6b37f9b5caafb5f8d0cbf Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期一, 10 三月 2025 14:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pom.xml |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index adb9384..a7ea6ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,13 +205,6 @@
                 <version>${kaptcha.version}</version>
             </dependency>
 
-            <!-- 浠g爜鐢熸垚-->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-generator</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-
             <!-- 鏍稿績妯″潡-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
@@ -405,6 +398,7 @@
         <module>cnas-manage</module>
         <module>cnas-process</module>
         <module>cnas-require</module>
+        <module>cnas_server</module>
         <module>cnas-device</module>
         <module>cnas-personnel</module>
     </modules>

--
Gitblit v1.9.3