From 7457e3aa4f2e0f640a08b35f47de1eabd555d7bf Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 05 六月 2024 17:00:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/resources/application.yml | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 96389f9..bb632b2 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -24,7 +24,7 @@ configuration: default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler # 閫氱敤鏋氫妇澶勭悊鍣� # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 鏃ュ織鎵撳嵃 - type-enums-package: com.monkeylessey.enums.general # 閫氱敤鏋氫妇鎵�鍦ㄥ寘璺緞 + type-enums-package: com.ycl.jxkg.domain.enums.general # 閫氱敤鏋氫妇鎵�鍦ㄥ寘璺緞 mapper-locations: classpath*:mapper/*.xml # mapper.xml浣嶇疆 system: @@ -64,8 +64,6 @@ hikari: idle-timeout: 600000 #10 min max-lifetime: 1800000 #30 min - - #runningtime environment profiles: - active: dev + active: dev -- Gitblit v1.8.0