From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/resources/application.yml |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/application.yml b/north-glass-erp/src/main/resources/application.yml
index fce62a7..48f46c8 100644
--- a/north-glass-erp/src/main/resources/application.yml
+++ b/north-glass-erp/src/main/resources/application.yml
@@ -1,12 +1,19 @@
 
+
+
 server:
   port: 8086
 
 ip: localhost
 port: 3306
 
+#sa-token:
+#  timeout: 86400
+
 
 spring:
+#  profiles:
+#    active: prod
   datasource:
     dynamic:
       primary: user_info #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster

--
Gitblit v1.8.0