Merge remote-tracking branch 'origin/master'

mitao

2024-06-04 addc1634a32502648e432ec52b89563b2b349cc6

 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -17,13 +17,13 @@
    nacos:
      discovery:
        # 服务注册地址
        server-addr: 127.0.0.1:8858
        server-addr: 192.168.110.188:8858
        service: ${spring.application.name}
        group: DEFAULT_GROUP
        namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
      config:
        # 配置中心地址
        server-addr: 127.0.0.1:8858
        server-addr: 192.168.110.188:8858
        namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be
        group: DEFAULT_GROUP
        name: ${spring.application.name}