eigent/server/app/model/user
puzhen 63b723e1cf merge main into feat/ask_with_single_agent
Resolve conflicts in:
- server/uv.lock (revision number, greenlet wheel format)
- src/store/chatStore.ts (merge target/displayContent and executionId/projectId params)
- src/components/ChatBox/BottomBox/InputBox.tsx (merge mention and trigger/expanded features)
- src/components/ChatBox/index.tsx (merge mention/direct-agent features with new unified layout)
2026-03-03 11:45:42 +00:00
..
admin.py merge main into feat/ask_with_single_agent 2026-03-03 11:45:42 +00:00
admin_role.py merge main into feat/ask_with_single_agent 2026-03-03 11:45:42 +00:00
key.py merge main into feat/ask_with_single_agent 2026-03-03 11:45:42 +00:00
privacy.py merge main into feat/ask_with_single_agent 2026-03-03 11:45:42 +00:00
role.py merge main into feat/ask_with_single_agent 2026-03-03 11:45:42 +00:00
user.py chore: fix pre commit format and pipeline issue (#1144) 2026-02-04 08:06:29 +08:00
user_credits.py merge main into feat/ask_with_single_agent 2026-03-03 11:45:42 +00:00
user_credits_record.py chore: fix pre commit format and pipeline issue (#1144) 2026-02-04 08:06:29 +08:00
user_stat.py merge main into feat/ask_with_single_agent 2026-03-03 11:45:42 +00:00