Merge remote-tracking branch 'origin/develop1.0' into develop_alioo

ali

2025-02-25 f94b708045d88e0de12d323d535eaea6a508eb18

 zhitan-admin/src/main/resources/application-dev.yml

@@ -35,7 +35,7 @@
      # 配置一个连接在池中最大生存的时间，单位是毫秒
      maxEvictableIdleTimeMillis: 900000
      # 配置检测连接是否有效
      validationQuery: SELECT 1 
      validationQuery: SELECT 1
      testWhileIdle: true
      testOnBorrow: false
      testOnReturn: false