From 353a35956f156b78beca56b08c1877455bb67a74 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 20 五月 2026 09:21:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/resources/application.yml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 6d46c20..3b05225 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -24,7 +24,7 @@
 
 # 寮�鍙戠幆澧冮厤缃�
 server:
-  # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
+  # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负9095
   port: 8080
   servlet:
     # 搴旂敤鐨勮闂矾寰�
@@ -53,7 +53,7 @@
     # 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
     basename: i18n/messages
   profiles:
-    active: srm
+    active: druid
   # 鏂囦欢涓婁紶
   servlet:
     multipart:
@@ -99,18 +99,18 @@
       logic-delete-value: 1 # 閫昏緫宸插垹闄ゅ��(榛樿涓� 1)
       logic-not-delete-value: 0 # 閫昏緫鏈垹闄ゅ��(榛樿涓� 0)
 #      update-strategy: IGNORED  #蹇界暐涓虹┖
-
+    call-setters-on-nulls: true
 
 # PageHelper鍒嗛〉鎻掍欢
-pagehelper:
-  helperDialect: mysql
-  supportMethodsArguments: true
-  params: count=countSql
+#pagehelper:
+#  helperDialect: mysql
+#  supportMethodsArguments: true
+#  params: count=countSql
 
 # Swagger閰嶇疆
 swagger:
   # 鏄惁寮�鍚痵wagger
-  enabled: false
+  enabled: true
   # 璇锋眰鍓嶇紑
   pathMapping: /
 

--
Gitblit v1.9.3