From 75ac3d5acdd448f063a3c307b4c733e37b4fc04f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 08 二月 2025 18:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index 6787c56..f729df1 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -5,13 +5,14 @@
   env: development
 #  env: production
 server:
-  port: 10022
+#  port: 10022
+  port: 10025
 
 spring:
-#  application:
+#  application:git
 #    name: doumeemes
   profiles:
-    active: dev
+    active: pro
 
   # JSON杩斿洖閰嶇疆
   jackson:
@@ -54,7 +55,7 @@
 # dao灞傜殑鏃ュ織璁剧疆涓篸ebug锛屾柟渚挎煡鐪媠ql
 logging:
   level:
-    doumeemes.dao: debug
+    com.doumee.dao: debug
 
 knife4j:
   enable: true

--
Gitblit v1.9.3