123 #17

Merged

p5i4afnyx merged 33 commits from main into cxf_branch

p5i4afnyx commented

Collaborator

12

p5i4afnyx added 33 commits

2991bee746 Merge pull request '前端代码1.0' (#6 ) from main into lcf_branch

4ac0dec65e 新增模块

acb823240c 路径规划

275eb0c73f 定位

e5d5af8211 区域规划

10e923f370 调整路径规划

2a36fdf112 修复显示问题

fe2cdf4db5 Merge pull request '前端2.0' (#8 ) from main into lcf_branch

8a07c69c24 文档1.3

1591436d81 Merge pull request '前端2.0' (#7 ) from wangjing into main

163776d844 Merge pull request '文档1.3' (#9 ) from lcf_branch into main

af24343b37 设置威胁区域

77aa42c33b Merge pull request '合并' (#10 ) from main into wangjing

5c6fe7d86a Merge pull request '合并新' (#11 ) from lcf_branch into wangjing

fc3aa2a842 临时保存本地对地图页的修改

e9949b98fc 尝试合并

96349565b9 Merge branch 'wangjing' of https://bdgit.educoder.net/pg9nrcf7t/Drone_project into wangjing

6063649779 路径规划

293fb54cad 合并成功

45c8d863a3 Merge branch 'wangjing' of https://bdgit.educoder.net/pg8nrcf7t/Drone_project into wangjing

e92b5b4e5b 路径规划

a87c2c48f3 Merge pull request '设置威胁区域' (#12 ) from lcf_branch into main

99a173afe3 tiaoshi

7b3ef352b0 优化

977a034d10 ok

a4b02ee618 删掉不要的

8fa0c5bde2 修改结构

11fb86ca15 设置大写

0044835731 Merge pull request '两点间的路径规划' (#13 ) from wangjing into main

1ab4944685 Merge pull request '两点间的路径规划' (#14 ) from main into lcf_branch

32dbe7dad0 文档优化

e39c5487ef Merge pull request '设计文档1.0' (#15 ) from lcf_branch into main

d33ad253b5 first

p5i4afnyx merged commit c3cd6641de into cxf_branch 2 months ago

p5i4afnyx referenced this issue from a commit

Merge pull request '123' (#17) from main into cxf_branch

The pull request has been merged as c3cd6641de.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: pg9nrcf7t/Drone_project#17