Merge branch 'dev' into dev_dz

zhuo

2025-02-22 0f17de2da3b49a27a89ec7c897f52a9386312585

 ruoyi-admin/pom.xml

@@ -91,6 +91,13 @@
            <artifactId>cnas-manage</artifactId>
        </dependency>

        <!--cnas设备管理-->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>cnas-device</artifactId>
        </dependency>


    </dependencies>

    <build>