Merge branch 'master' of https://gogsb.soaringnova.com/chenguilong/yl-ocr-layout

Dockerfile

@@ -104,7 +104,11 @@ RUN git clone https://gitee.com/monkeycc/yolov5.git
 # RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/best2.pt
 RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/8-14_layout_model.pt
 
+<<<<<<< HEAD
 ADD . /workspace    
+=======
+ADD . /workspace
+>>>>>>> c601e364731d7b77166389ec8f65369aff0bceb6
 EXPOSE 8080