Merge branch 'feature-tianyong' into gym-test

src/page-instrument/api.ts

@@ -50,6 +50,11 @@ export const studentQueryUserInfo = async () => {
         id:data.id,
         gender:""
       }
+      if (res.data.specialInstrumentIds.length > 1 && data.extInstrumentNames?.length) {
+        data.extInstrumentNames.forEach((ext: any) => {
+          res.data.specialInstrumentIds.push(ext.instrumentIds)
+        })
+      }
       return res
     }
   } catch (error) {