From e8ce24f3a378d1fdb5c1c9e6fbecb067aa22cdd9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 20 七月 2023 23:23:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/GunsApplication.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/GunsApplication.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/GunsApplication.java
index 8ad66ba..30e1ded 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/GunsApplication.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/GunsApplication.java
@@ -4,6 +4,7 @@
import org.apache.http.config.SocketConfig;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.mybatis.spring.annotation.MapperScan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
@@ -29,7 +30,8 @@
@SpringBootApplication
@EnableScheduling//开启定时任务
@EnableTransactionManagement//启动事务功能
-public class GunsApplication /*extends SpringBootServletInitializer*/ {
+@MapperScan("com.supersavedriving.driver.modular.system.dao")
+public class GunsApplication {
private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class);
@@ -76,8 +78,4 @@
}
-// @Override
-// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-// return builder.sources(GunsApplication.class);
-// }
}
--
Gitblit v1.7.1