From 0ebb006ea17307cbd9d681f45467f8f49715a5fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 16:52:01 +0800
Subject: [PATCH] 解决冲突

---
 server/company/src/main/java/com/doumee/CompanyApplication.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/CompanyApplication.java b/server/company/src/main/java/com/doumee/CompanyApplication.java
index 3e9fae0..b664755 100644
--- a/server/company/src/main/java/com/doumee/CompanyApplication.java
+++ b/server/company/src/main/java/com/doumee/CompanyApplication.java
@@ -4,6 +4,7 @@
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.ApplicationContext;
 
 /**

--
Gitblit v1.9.3