Merge branch 'zcwy-zsx' into dev0731

# Conflicts:
#	src/views/project/ProjectDetails.vue

src/views/project/ProjectDetails.vue

@@ -26,7 +26,8 @@
             </div>
           </div>
           <div v-if="i.id == '0' && i.taskProcessList?.length == 0"></div>
-          <div v-else class="course" v-for="(value, index) in (i.taskProcessList.sort((a, b) => { return a.id - b.id; })).filter(
+          <!--去掉阶段内按id排序，以接口返回顺序排序 .sort((a, b) => { return a.id - b.id; })-->
+          <div v-else class="course" v-for="(value, index) in (i.taskProcessList).filter(
             (e) => !whiteTypes(e.type)
           )" :key="index">
             <div style="width: 70%">