Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-09 b5ae703a499b97fd83dd9a7b67a10a7b8157df5f

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

@@ -6,7 +6,7 @@
      # 主库数据源
      master:
        driverClassName: org.postgresql.Driver
        url: jdbc:postgresql://112.98.126.2:35432/ry-vue?stringtype=unspecified
        url: jdbc:postgresql://112.98.126.2:35432/ry-vue?stringtype=unspecified&TimeZone=Asia/Shanghai
        username: postgres
        password: Yykj.2017
        # 从库数据源