From c4032aae88a079d8bb1198723d88c6e72935516b Mon Sep 17 00:00:00 2001
From: bleachtred <bleachtred@163.com>
Date: 星期二, 04 七月 2023 17:59:28 +0800
Subject: [PATCH] fix 修复相同字段mapstruct会自动赋值问题
---
pom.xml | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9629c9a..33fa3bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<spring-boot-admin.version>3.0.4</spring-boot-admin.version>
<redisson.version>3.20.1</redisson.version>
<lock4j.version>2.2.4</lock4j.version>
- <dynamic-ds.version>3.6.1</dynamic-ds.version>
+ <dynamic-ds.version>4.0.0</dynamic-ds.version>
<alibaba-ttl.version>2.14.2</alibaba-ttl.version>
<powerjob.version>4.3.3</powerjob.version>
<mapstruct-plus.version>1.3.1</mapstruct-plus.version>
@@ -201,7 +201,7 @@
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
<version>${dynamic-ds.version}</version>
</dependency>
@@ -272,6 +272,17 @@
<version>${lock4j.version}</version>
</dependency>
+ <!-- PowerJob -->
+ <dependency>
+ <groupId>tech.powerjob</groupId>
+ <artifactId>powerjob-worker-spring-boot-starter</artifactId>
+ <version>${powerjob.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tech.powerjob</groupId>
+ <artifactId>powerjob-official-processors</artifactId>
+ <version>${powerjob.version}</version>
+ </dependency>
<dependency>
<groupId>com.alibaba</groupId>
@@ -328,18 +339,6 @@
<groupId>org.dromara</groupId>
<artifactId>ruoyi-demo</artifactId>
<version>${revision}</version>
- </dependency>
-
- <!-- PowerJob -->
- <dependency>
- <groupId>tech.powerjob</groupId>
- <artifactId>powerjob-worker-spring-boot-starter</artifactId>
- <version>${powerjob.version}</version>
- </dependency>
- <dependency>
- <groupId>tech.powerjob</groupId>
- <artifactId>powerjob-official-processors</artifactId>
- <version>${powerjob.version}</version>
</dependency>
</dependencies>
--
Gitblit v1.9.3