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

zss

2025-03-13 3b92cf3f9cd038c446e390aab18e759b0463d24a

 ruoyi-admin/pom.xml

@@ -54,12 +54,6 @@
            <artifactId>ruoyi-framework</artifactId>
        </dependency>

        <!-- 代码生成-->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-generator</artifactId>
        </dependency>

        <!--基础模块-->
        <dependency>
            <groupId>com.ruoyi</groupId>