ci: bugfix

ci: 修复合并冲突内容

🐛 fix: resolve upstream merge type drift

🐛 fix: resolve upstream merge type drift

Merge remote-tracking branch 'origin/canary' into canary

# Conflicts:
#	packages/utils/src/compressImage.test.ts

Merge branch 'lobehub:canary' into canary

Merge remote-tracking branch 'upstream/canary' into canary

chore: 优化合并上游工作流

merge: 合并上游代码

merge: 合并上游ui调整