Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-08 2d5fdd624858e438a7153a8d3a55add8d2fdfda2

 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: