From 17480b5b82744f4c74b61a2f1e4e5ea780ccc3ff Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 27 十一月 2024 13:45:25 +0800
Subject: [PATCH] 修复冲突
---
pom.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 313f380..8bd8d0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<minidao.version>1.9.0</minidao.version>
<!-- 绉湪鎶ヨ〃-->
- <jimureport-spring-boot-starter.version>1.5.8</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>
@@ -347,7 +347,7 @@
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-nosql-starter</artifactId>
- <version>1.5.6</version>
+ <version>1.6.0</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -430,7 +430,7 @@
<!--褰撳墠鐜-->
<profile.name>dev</profile.name>
<!--Nacos鏈嶅姟鍦板潃-->
- <config.server-addr>192.168.19.168:8848</config.server-addr>
+ <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
</properties>
</profile>
<!-- 娴嬭瘯 -->
--
Gitblit v1.9.3