同步、客户端更新 #9

Merged

m6wf5oeyl merged 33 commits from master into yangyizhe_branch

m6wf5oeyl commented

Owner

前端重新设计、卫星地图实现

m6wf5oeyl added 33 commits

2c67f79289 update

f1a11897ff 用例图及部署图待修改

138cf76182 readme

4b639662e8 change 1

1a31cd9b90 用例图change 部署图待改

969a7d991e 待改

d0f9e70bf1 a

9affcf977a Merge branch 'geekChenys_branch' into develop

1de696b151 PR yyz

2b1cec46b5 Merge pull request 'model' (#1 ) from yangyizhe_branch into develop

675d70403d Merge pull request 'requirement first round' (#2 ) from develop into master

e7c50eff5c Update README.md

63d5a40cf8 Merge pull request '设计文档初稿' (#3 ) from yangyizhe_branch into master

86be319e9c Delete 'doc/~$于空地协同的伤情态势感知分析系统”软件设计规格说明书.docx'

1824a8b9c9 Delete 'doc/~$于空地协同的伤情态势感知分析系统”软件需求规格说明书.docx'

cd7ba0f2ae Delete 'doc/~WRL0001.tmp'

aac845678e src of aircarft

e861d1e9b7 Merge branch 'master' of https://bdgit.educoder.net/m6wf5oeyl/Enjoy

merge branch geekchen into master

ba53d6fbc2 cys changes src

b456e18465 Merge pull request '设计模型和设计文档' (#4 ) from yangyizhe_branch into master

0bbbd5970d Merge pull request '部分源码' (#5 ) from yangyizhe_branch into master

ce1a29964a src

8489d8b38e yolo

6bb2935599 upload for robot

27bd1d3c34 11

79f98c0b56 yolo的代码

777197881b Merge pull request '机器狗代码' (#6 ) from liqiushi_branch into master

accept

f64e951f79 Merge pull request '主分支到张超群分支' (#7 ) from master into zhangchaoqun_branch

080537a240 数据库

7850da49de 同意合并数据库相关代码

a6693baa3e 客户端界面设计、卫星地图完成

afd92d1fc5 界面

76e0d31835 modify client2

m6wf5oeyl merged commit 72424e0792 into yangyizhe_branch 6 months ago

m6wf5oeyl referenced this issue from a commit

Merge pull request '同步、客户端更新' (#9) from master into yangyizhe_branch

The pull request has been merged as 72424e0792.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: m6wf5oeyl/Enjoy#9