From 14b70bacd63f6b136612cf70b160777142e2a996 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 十月 2024 10:14:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/company/src/main/resources/application.yml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index fc2ec48..ffeb82e 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -5,10 +5,10 @@
   env: development
 #  env: production
 server:
-  port: 10012
+  port: 10022
 
 spring:
-#  application:
+#  application:git
 #    name: doumeemes
   profiles:
     active: dev

--
Gitblit v1.9.3