Merge branch 'develop' of https://gitlab.redhtc.com/Berlincen/DA-Platform into develop

# Conflicts: # 文档/~$功能组_接口文档.docx

Merge branch 'develop' of https://gitlab.redhtc.com/Berlincen/DA-Platform into develop
# Conflicts: # 文档/~$功能组_接口文档.docx
83ad9d73 · 李景熙 · 248ed0b3 · 5c9a2220 · 83ad9d73 · 83ad9d73
Commit 83ad9d73 authored Jun 04, 2020 by 李景熙
3 changed files
--- a/DAPlatform/views/__pycache__/imageAnnotation.cpython-36.pyc
+++ b/DAPlatform/views/__pycache__/imageAnnotation.cpython-36.pyc
--- a/文档/~$功能组_接口文档.docx
+++ b/文档/~$功能组_接口文档.docx
--- a/文档/通用功能组_接口文档.docx
+++ b/文档/通用功能组_接口文档.docx