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

zss

2025-03-13 3b92cf3f9cd038c446e390aab18e759b0463d24a

 pom.xml

@@ -389,16 +389,15 @@
        <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>
    </modules>
    <packaging>pom</packaging>