Merge branch 'herb' into cloud

bsw215583320

2024-11-08 afabdb515b405e0130f4715720a692b61910ec56

 pom.xml

@@ -56,7 +56,7 @@
      <minidao.version>1.9.0</minidao.version>

      <!-- 积木报表-->
      <jimureport-spring-boot-starter.version>1.5.6</jimureport-spring-boot-starter.version>
      <jimureport-spring-boot-starter.version>1.7.2-beta</jimureport-spring-boot-starter.version>
      <commons.version>2.6</commons.version>
      <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
      <aliyun.oss.version>3.11.2</aliyun.oss.version>
@@ -332,6 +332,7 @@
            </exclusions>
         </dependency>
         <!-- 积木报表-->

         <dependency>
            <groupId>org.jeecgframework.jimureport</groupId>
            <artifactId>jimureport-spring-boot-starter</artifactId>
@@ -346,7 +347,7 @@
         <dependency>
            <groupId>org.jeecgframework.jimureport</groupId>
            <artifactId>jimureport-nosql-starter</artifactId>
            <version>${jimureport-spring-boot-starter.version}</version>
            <version>1.6.0</version>
         </dependency>
      </dependencies>
   </dependencyManagement>
@@ -429,7 +430,7 @@
                <!--当前环境-->
                <profile.name>dev</profile.name>
            <!--Nacos服务地址-->
                <config.server-addr>127.0.0.1:8848</config.server-addr>
                <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
            </properties>
        </profile>
        <!-- 测试 -->