Merge pull request 'final' (#53) from majian_branch into master

2 years ago · 4ff5503da1
parent ca6c0289ea eb572bfaf3
commit 4ff5503da1
11 changed files with 6 additions and 0 deletions
--- a/doc/~$协同无人侦察系统-软件设计规格说明书.doc
+++ b/doc/~$协同无人侦察系统-软件设计规格说明书.doc
--- a/doc/~$协同无人侦察系统-软件需求构思及描述.docx
+++ b/doc/~$协同无人侦察系统-软件需求构思及描述.docx
--- a/doc/~WRL0001.tmp
+++ b/doc/~WRL0001.tmp
--- a/doc/汇报.pptx
+++ b/doc/汇报.pptx
--- a/doc/空地协同无人侦察系统-软件设计规格说明书.doc
+++ b/doc/空地协同无人侦察系统-软件设计规格说明书.doc
--- a/doc/空地协同无人侦察软件开发项目的个人自评报告.xlsx
+++ b/doc/空地协同无人侦察软件开发项目的个人自评报告.xlsx
--- a/model/设计类/~$$精化类图.~vsdx
+++ b/model/设计类/~$$精化类图.~vsdx
--- a/model/设计类/体系结构设计图.vsdx
+++ b/model/设计类/体系结构设计图.vsdx
--- a/model/设计类/精化类图.vsdx
+++ b/model/设计类/精化类图.vsdx
--- a/src/.scannerwork/.sonar_lock
+++ b/src/.scannerwork/.sonar_lock
--- a/src/.scannerwork/report-task.txt
+++ b/src/.scannerwork/report-task.txt
@ -0,0 +1,6 @@
 projectKey=CEC
 serverUrl=http://localhost:9000
 serverVersion=9.4.0.54424
 dashboardUrl=http://localhost:9000/dashboard?id=CEC
 ceTaskId=AYHgkSABciXJR8mKLIhs
 ceTaskUrl=http://localhost:9000/api/ce/task?id=AYHgkSABciXJR8mKLIhs