From 7cd67f6335923011c74d42b6296877ff4bce62e9 Mon Sep 17 00:00:00 2001
From: jay <75509151@qq.com>
Date: Mon, 5 Jun 2023 22:30:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=20mapstruct=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cc/iotkit/data/config/AutoMapperConfig3.java    | 3 ++-
 .../main/java/cc/iotkit/manager/config/AutoMapperConfig2.java | 4 ++--
 .../main/java/cc/iotkit/system/config/AutoMapperConfig.java   | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/config/AutoMapperConfig3.java b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/config/AutoMapperConfig3.java
index be1bcc15..854e43ba 100644
--- a/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/config/AutoMapperConfig3.java
+++ b/iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/config/AutoMapperConfig3.java
@@ -9,7 +9,8 @@ import io.github.linpeilie.annotations.MapperConfig;
  * @Version: V1.0
  * @Description: mapperstruct 配置
  */
-@MapperConfig(mapperPackage = "cc.iotkit.data.model")
+@MapperConfig(mapperPackage = "cc.iotkit.data.model",
+        adapterPackage="cc.iotkit.data.model")
 
 public class AutoMapperConfig3 {
 }
diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/config/AutoMapperConfig2.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/config/AutoMapperConfig2.java
index 65681ebe..f8ca12f4 100644
--- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/config/AutoMapperConfig2.java
+++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/config/AutoMapperConfig2.java
@@ -9,7 +9,7 @@ import io.github.linpeilie.annotations.MapperConfig;
  * @Version: V1.0
  * @Description: mapperstruct 配置
  */
-@MapperConfig(mapperPackage = "cc.iotkit.manager.dto")
-@ComponentModelConfig(componentModel = "default")
+@MapperConfig(mapperPackage = "cc.iotkit.manager.dto",
+        adapterPackage="cc.iotkit.manager.dto")
 public class AutoMapperConfig2 {
 }
diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/config/AutoMapperConfig.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/config/AutoMapperConfig.java
index 9fa37f30..0417026e 100644
--- a/iot-module/iot-system/src/main/java/cc/iotkit/system/config/AutoMapperConfig.java
+++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/config/AutoMapperConfig.java
@@ -9,6 +9,7 @@ import io.github.linpeilie.annotations.MapperConfig;
  * @Version: V1.0
  * @Description: mapperstruct 配置
  */
-@MapperConfig(mapperPackage = "cc.iotkit.system.dto")
+@MapperConfig(mapperPackage = "cc.iotkit.system.dto"
+,adapterPackage="cc.iotkit.system.dto")
 public class AutoMapperConfig {
 }