宅房 f01c5c6a6a Merge remote-tracking branch 'origin/main' ...

解决目录重组冲突:
- doc/ → docs/ (文档目录重命名)
- doc/sql/ → database/ (数据库脚本目录重组)
- doc/script/ → scripts/ (脚本目录重组)

保留本地新增的武术比赛系统文件:
- docs/sql/mysql/martial-*.sql (4个数据库脚本)
- docs/后端开发完成报告.md
- docs/数据库字段检查报告.md
- docs/问题修复报告.md

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

2025-11-30 12:13:15 +08:00

26 KiB

Raw Blame History

View Raw