Merge branch 'springboot3'

# Conflicts:
#	chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatMemoryUpdateReq.java
#	chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/AgentController.java
#	chat/server/src/main/resources/mapper/ChatContextMapper.xml
#	webapp/pnpm-lock.yaml
This commit is contained in:
wua.ming
2024-12-09 12:16:57 +08:00
87 changed files with 237 additions and 244 deletions

View File

@@ -20,4 +20,4 @@
from s2_chat_context where chat_id=#{chatId} limit 1
</select>
</mapper>
</mapper>