Labels Milestones

合并 #7

Merged

pkv3rwifo merged 14 commits from main into huaijin 10 months ago

Conversation 0 Commits 14 Files Changed 50

pkv3rwifo commented 10 months ago

Collaborator

There is no content yet.

pkv3rwifo added 14 commits 10 months ago

af4640c247 Merge pull request '机器狗与雷达代码' (#4) from huaijin into main

84c1fbc0dd 重叠问题

1bfbbd5122 解决合并冲突：保留数据库和样式管理器的include语句，移除可执行文件

8f035cb64e Merge pull request '冲突合并' (#5) from huaijin into main

27d7ca908e 集成facelight模块

8fcf835e2b 移除二进制可执行文件并加入）

41d2933249 配置管理优化：解决团队成员配置冲突问题 ...

- 添加项目根目录.gitignore统一管理忽略规则
- 创建数据库配置文件模板和示例便于团队协作
- 优化ConfigManager支持多层配置加载优先级
- 移除冗余的子目录.gitignore文件
- 完善配置文档说明团队协作流程

c064453fdb Merge branch 'main' of https://bdgit.educoder.net/pp3xivymc/Software_Architecture

ca79670650 不明白为什么这三个文件总是显示冲突

ab677d5a12 Merge branch 'main' of https://bdgit.educoder.net/pp3xivymc/Software_Architecture

6a0e91b955 功能模块简化,形成单独界面

264f14eacc 合并远程更改并修复段错误问题 ...

- 解决MainWindow.h的合并冲突，保持本地版本
- 保留远程对RightFunctionPanel的重构（删除设备卡片）
- 修复段错误：通过改进updateDeviceStatus逻辑避免空指针访问
- 程序现在可以正常启动和运行，无段错误

391817e769 文档完善

860d33f471 Merge branch 'main' of https://bdgit.educoder.net/pp3xivymc/Software_Architecture

pkv3rwifo merged commit d25af828cb into huaijin 10 months ago

pkv3rwifo referenced this issue from a commit 10 months ago

Merge pull request '合并' (#7) from main into huaijin

The pull request has been merged as d25af828cb.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: pp3xivymc/Software_Architecture#7

Write Preview

Loading…

Cancel

Save

There is no content yet.