Merge branch 'dev_cr' into dev

zhuo

2025-02-28 217e39bec2ae2a861c4619d277ab0bc823cf85d4

 pom.xml

@@ -271,6 +271,20 @@
                <version>${ruoyi.version}</version>
            </dependency>

            <!--cnas资源要求-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>cnas-process</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!--cnas人员-->
            <dependency>
                <groupId>com.ruoyi</groupId>
                <artifactId>cnas-personnel</artifactId>
                <version>${ruoyi.version}</version>
            </dependency>

            <!-- minio -->
            <dependency>
                <groupId>io.minio</groupId>
@@ -384,6 +398,8 @@
        <module>cnas-require</module>
        <module>cnas-manage</module>
        <module>cnas-device</module>
        <module>cnas-process</module>
        <module>cnas-personnel</module>
    </modules>
    <packaging>pom</packaging>