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

DYL0109

2025-04-16 75f043dfa6660716364e66ee0b3cf99f44255686

 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:
        # 从数据源开关/默认关闭