Merge branch 'develop' of C:\Users\ljxfai\Desktop\DA-Platform with conflicts.

d6116ab5 · 李景熙 · 09d117ad · d6116ab5 · d6116ab5 · d6116ab5
Commit d6116ab5 authored Jul 13, 2020 by 李景熙
3 changed files
--- a/DAPlatform/views/__pycache__/imageAnnotation.cpython-37.pyc
+++ b/DAPlatform/views/__pycache__/imageAnnotation.cpython-37.pyc
--- a/DAPlatform/views/__pycache__/task.cpython-37.pyc
+++ b/DAPlatform/views/__pycache__/task.cpython-37.pyc
--- a/DAPlatform/views/__pycache__/textAnnotation.cpython-37.pyc
+++ b/DAPlatform/views/__pycache__/textAnnotation.cpython-37.pyc