合并 #7

Merged
pkv3rwifo merged 14 commits from main into huaijin 1 month ago

14 Commits (main)

Author SHA1 Message Date
huaijin 860d33f471 Merge branch 'main' of https://bdgit.educoder.net/pp3xivymc/Software_Architecture
1 month ago
huaijin 391817e769 文档完善
1 month ago
123 264f14eacc 合并远程更改并修复段错误问题
1 month ago
123 6a0e91b955 功能模块简化,形成单独界面
1 month ago
root ab677d5a12 Merge branch 'main' of https://bdgit.educoder.net/pp3xivymc/Software_Architecture
1 month ago
root ca79670650 不明白为什么这三个文件总是显示冲突
1 month ago
123 c064453fdb Merge branch 'main' of https://bdgit.educoder.net/pp3xivymc/Software_Architecture
1 month ago
123 41d2933249 配置管理优化:解决团队成员配置冲突问题
1 month ago
root 8fcf835e2b 移除二进制可执行文件并加入)
1 month ago
root 27d7ca908e 集成facelight模块
1 month ago
pkv3rwifo 8f035cb64e Merge pull request '冲突合并' (#5) from huaijin into main
1 month ago
123 1bfbbd5122 解决合并冲突:保留数据库和样式管理器的include语句,移除可执行文件
1 month ago
123 84c1fbc0dd 重叠问题
1 month ago
pkv3rwifo af4640c247 Merge pull request '机器狗与雷达代码' (#4) from huaijin into main
1 month ago