From 69efc3261e6f6e4dca268fb2de9866d8f2a14952 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期一, 21 四月 2025 09:44:09 +0800
Subject: [PATCH] Merge branch 'dev'

---
 ruoyi-common/ruoyi-common-tenant/src/main/java/org/ruoyi/common/tenant/config/TenantConfig.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/ruoyi/common/tenant/config/TenantConfig.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/ruoyi/common/tenant/config/TenantConfig.java
index 6bf0c56..a5f40ae 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/ruoyi/common/tenant/config/TenantConfig.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/ruoyi/common/tenant/config/TenantConfig.java
@@ -6,7 +6,7 @@
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import org.ruoyi.common.core.utils.reflect.ReflectUtils;
-import org.ruoyi.common.mybatis.config.MybatisPlusConfig;
+
 import org.ruoyi.common.redis.config.RedisConfig;
 import org.ruoyi.common.redis.config.properties.RedissonProperties;
 import org.ruoyi.common.tenant.core.TenantSaTokenDao;
@@ -17,6 +17,7 @@
 import org.redisson.config.ClusterServersConfig;
 import org.redisson.config.SingleServerConfig;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
+import org.ruoyi.config.MybatisPlusConfig;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

--
Gitblit v1.9.3