Merge branch 'develop1.0' into zhangjw_from_develop1.0

z1415143022

2025-03-25 75f9894ebac12b13c7ead27c3e16db833ee9251a

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

@@ -6,9 +6,9 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:postgresql://127.0.0.1:5432/energy
        username: root
        password: 123456
        url: jdbc:postgresql://127.0.0.1:5432/zhitan_ems
        username: postgres
        password: postgres
      # 从库数据源
      slave:
        # 从数据源开关/默认关闭