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

lxp

2025-03-15 5a697e6fafbe3855336ca5fd7e1785de12840d16

 pom.xml

@@ -268,6 +268,13 @@
                <version>${ruoyi.version}</version>
            </dependency>

            <!--信息通知-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>notice-server</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!--cnas设备管理-->
            <dependency>
                <groupId>com.ruoyi</groupId>
@@ -389,17 +396,17 @@
        <module>ruoyi-admin</module>
        <module>ruoyi-framework</module>
        <module>ruoyi-system</module>
        <module>ruoyi-quartz</module>
        <module>ruoyi-generator</module>
        <module>ruoyi-common</module>
        <module>basic-server</module>
        <module>inspect-server</module>
        <module>performance-server</module>
        <module>cnas-manage</module>
        <module>cnas-device</module>
        <module>cnas-process</module>
        <module>cnas-require</module>
        <module>cnas-device</module>
        <module>cnas_server</module>
        <module>cnas-personnel</module>
        <module>notice-server</module>
    </modules>
    <packaging>pom</packaging>