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

src/components/drawers/ProjectAudit.vue

@@ -219,7 +219,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer" style="margin-right: 32px;">取消</button>
         <button class="btn2" @click="subMit">确定</button>
       </div>
     </div>

src/components/student/CommonStudent.vue

@@ -14,7 +14,7 @@
         <div style="display: flex; overflow-x: auto; overflow-y: auto">
           <div class="tabs" style="min-width: 800px">
             <a-tabs v-model:activeKey="activeKey">
-              <a-tab-pane v-if="isGroup" :key="4" tab="项目内学员">
+              <a-tab-pane v-if="isGroup" :key="4" tab="项目内学员1">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div>
                     <a-form-item label="姓名：">
@@ -400,7 +400,7 @@ const getStu = () => {
     let array = [];
     arr.map((value) => {
       let obj = {
-        id: value.id,
+        id: value.studentId,
         studentId: value.studentId,
         realName: value.studentName,
         userNo: value.studentUserNo,