From 31c9104b7e4f963110ee581ac05a3a5addc109f5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 16:50:48 +0800
Subject: [PATCH] 解决冲突
---
server/company/src/main/java/com/doumee/CompanyApplication.java | 1 -
1 files changed, 0 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..3e9fae0 100644
--- a/server/company/src/main/java/com/doumee/CompanyApplication.java
+++ b/server/company/src/main/java/com/doumee/CompanyApplication.java
@@ -15,7 +15,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