Merge remote-tracking branch 'origin/dev' into dev

lxp

2025-03-10 7a838ed69de1d9593fe6b37f9b5caafb5f8d0cbf

 pom.xml

@@ -205,13 +205,6 @@
                <version>${kaptcha.version}</version>
            </dependency>

            <!-- 代码生成-->
            <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>