From cf9b836069e0a76571c6611642b2d7abb0586a2b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 18:20:40 +0800
Subject: [PATCH] 解决冲突
---
server/company/src/main/java/com/doumee/CompanyApplication.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/CompanyApplication.java b/server/company/src/main/java/com/doumee/CompanyApplication.java
index 884105a..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;
/**
@@ -15,7 +16,6 @@
@SpringBootApplication
@MapperScan("com.doumee.dao")
public class CompanyApplication {
-
public static void main(String[] args) {
ApplicationContext context = SpringApplication.run(CompanyApplication.class);
context.getEnvironment();
--
Gitblit v1.9.3