Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

 north-glass-erp/src/main/resources/application.yml

@@ -1,15 +1,19 @@



server:
  port: 8086

ip: localhost
port: 3306

sa-token:
  timeout: 86400
#sa-token:
#  timeout: 86400


spring:
#  profiles:
#    active: prod
  datasource:
    dynamic:
      primary: user_info #设置默认的数据源或者数据源组,默认值即为master