Merge branch 'master' into jenkins

src/school/companion-teacher/companion-teacher-register.tsx

@@ -204,15 +204,14 @@ export default defineComponent({
         //授权
         const code = getUrlCode()
         if (!code) {
-          const { returnUrl, ...rest } = route.query
           const newUrl =
             window.location.origin +
             window.location.pathname +
             '#' +
-            returnUrl +
+            route.path +
             '?' +
             qs.stringify({
-              ...rest
+              ...route.query
             })
           getAppIdAndCode(newUrl)
           return