Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/img/UploadImg.vue

src/views/homework/HomeworkPage.vue

@@ -26,10 +26,9 @@
         </div>
       </div>
     </div>
-    <div @click="returnclick">返回</div>
     <!-- 面包屑导航 -->
     <div class="debateTitle" style="color: #fff">
-      【作业】管理者进阶腾飞班 - 中级管理者作业
+      【作业】 {{ data?.workName }}
     </div>
     <!-- 详细信息 -->
     <div class="detailinfo">
@@ -284,6 +283,7 @@ const {
 } = useRoute();
 
 const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId });
+console.log("data", data);
 const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, {
   workerId: workId,
 });