Merge branch 'master' into online

dev-dist/sw.js

@@ -82,7 +82,15 @@ define(['./workbox-ab7aa862'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
+<<<<<<< HEAD
     "revision": "0.npjf49t2n6o"
+=======
+<<<<<<< Updated upstream
+    "revision": "0.d4djpv1e6ho"
+=======
+    "revision": "0.s7m31fjqcb8"
+>>>>>>> Stashed changes
+>>>>>>> startLogin
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

src/views/studentList/components/baseInfo.tsx

@@ -203,7 +203,7 @@ export default defineComponent({
               取消
             </NButton>
             <NButton
-            loading={loading.value}
+
               class={styles.btn}
               type="primary"
               onClick={() => showUpdate.value = true}>
@@ -227,7 +227,7 @@ export default defineComponent({
             </p>
 
             <NSpace class={styles.btnGroup} justify="center">
-              <NButton round type="primary" onClick={handleSave}>
+              <NButton round type="primary" onClick={handleSave}   loading={loading.value}>
                 确定
               </NButton>
               <NButton round onClick={() => (showUpdate.value = false)}>