Merge remote-tracking branch 'origin/master'

jiangping

2025-03-05 76d7d384741f5d1e7f2cd8564aba13974d983ee1

 server/meeting/pom.xml

@@ -13,7 +13,6 @@
    <modules>
        <module>meeting_admin</module>
        <module>meeting_service</module>
        <module>meeting_web</module>
    </modules>
    <properties>
        <maven.compiler.source>8</maven.compiler.source>
@@ -23,14 +22,19 @@
    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
       <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-dependencies</artifactId>
            <version>2.3.12.RELEASE</version>
            <type>pom</type>
            <scope>import</scope>
        </dependency>
        <!--   <dependency>
               <groupId>org.springframework.cloud</groupId>
               <artifactId>spring-cloud-starter-bootstrap</artifactId>
           </dependency>-->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
            <!-- <version>2.2.7.RELEASE</version>-->
        </dependency>
        <!--<dependency>
            <groupId>org.springframework.cloud</groupId>
@@ -38,14 +42,10 @@
        </dependency>-->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
<!--            <version>2.2.7.RELEASE</version>-->
        </dependency>
        <dependency>
            <groupId>com.alibaba.cloud</groupId>
            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<!--            <version>2.2.7.RELEASE</version>-->
            <!-- <version>2.2.7.RELEASE</version>-->
        </dependency>

        <!-- 接口文档 -->
    </dependencies>
</project>