• youxiaoji's avatar
    Merge branch 'refs/heads/main' into develop_tmp · 72ec5880
    youxiaoji authored
    # Conflicts:
    #	backend/src/main/java/pangea/hiagent/agent/react/DefaultReactExecutor.java
    #	backend/src/main/java/pangea/hiagent/agent/service/AgentChatService.java
    #	backend/src/main/java/pangea/hiagent/agent/service/StreamRequestService.java
    #	backend/src/main/java/pangea/hiagent/agent/service/UserSseService.java
    #	backend/src/main/java/pangea/hiagent/tool/impl/HisenseTripTool.java
    #	backend/src/main/java/pangea/hiagent/tool/impl/VisitorAppointmentTool.java
    #	backend/src/main/java/pangea/hiagent/web/service/InfoCollectorService.java
    #	frontend/src/components/ChatArea.vue
    72ec5880