Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-21 2aa0ffa6eea188f44eabc50617ddf97c804fc89f

 ruoyi-admin/src/main/resources/application-dev-druid.yml

@@ -51,7 +51,7 @@
          enabled: true
          # 慢SQL记录
          log-slow-sql: true
          slow-sql-millis: 3000
          slow-sql-millis: 10000
          merge-sql: true
        wall:
          config: