Merge branch 'feature-2025-1-10' into jenkins-test

src/views/student-register/index-apply.tsx

@@ -2035,9 +2035,9 @@ export default defineComponent({
                 }
                 // 更换年级班级后，判断是否需要更换赠送的乐器
                 if (forms.schoolInstrumentSetType === 'GRADE') {
-                  state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === studentInfo.extra.currentGradeNum && item.classNum === selectedOption.value) )
-                }
-                // console.log('选择111',state.currentIntrument)
+                  state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === selectedOption.value))
+                }                
+                console.log('选择111',state.currentIntrument)
               }}
             />
           )}
@@ -2070,8 +2070,8 @@ export default defineComponent({
                 }
                 // 更换年级班级后，判断是否需要更换赠送的乐器
                 if (forms.schoolInstrumentSetType === 'CLASS') {
-                  state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === selectedOption.value))
-                }
+                  state.currentIntrument = state.intrumentList.find((item: any) => (item.gradeNum === studentInfo.extra.currentGradeNum && item.classNum === selectedOption.value) )
+                }                
                 // console.log('选择222',state.currentIntrument)
               }}
             />