From 74c86606c9abc778a3848025395d7c7d6fbcfac0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Tue, 19 Jul 2022 15:28:19 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
index 685c3a7..1424c46 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
@@ -23,7 +23,7 @@
import java.util.Arrays;
@Configuration
-@MapperScan(basePackages = {"com.gkhy.safePlatform.emergency","com.gkhy.safePlatform.emergency"},
+@MapperScan(basePackages = {"com.gkhy.safePlatform.emergency"},
sqlSessionTemplateRef = "sqlTemplateEmergency",annotationClass =
Repository.class)
public class MyBatisConfigEmergency {
@@ -50,7 +50,7 @@
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
//-------------------
- Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**Mapper.xml");
+ Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**/**Mapper.xml");
// Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml");
ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1));
// resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2)));
--
Gitblit v1.9.2