Merge branch 'develop1.0' into wt_from_develop1.0

VVT789

2025-02-10 6c5150dfdd69a9c1d5db9c9780f721759b0e0e9c

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

@@ -6,7 +6,7 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:postgresql://127.0.0.1:5432/energy
        url: jdbc:postgresql://127.0.0.1:5432/energy_ml
        username: root
        password: 123456
      # 从库数据源