Merge branch 'dev' into dev_zj

zss

2025-03-11 eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d

 ruoyi-framework/pom.xml

@@ -52,6 +52,10 @@
            <groupId>com.github.oshi</groupId>
            <artifactId>oshi-core</artifactId>
        </dependency>
        <dependency>
            <groupId>com.deepoove</groupId>
            <artifactId>poi-tl</artifactId>
        </dependency>

        <!-- 系统模块-->
        <dependency>