Merge remote-tracking branch 'bak/master' into master-lpyun

baoshiwei

8 天以前 220db80e605945ced1b33443020933206b0915db

 src/views/sys/login/LoginSelect.vue

@@ -144,6 +144,7 @@
        }
        
        let multi_depart = loginResult.multi_depart;
        console.log("loginResult::",loginResult);
        //0:无部门 1:一个部门 2:多个部门
        if (multi_depart == 0) {
          notification.warn({
@@ -262,6 +263,7 @@
       * 弹窗打开前处理
       */
      async function show(loginResult) {
        console.log("showLoginResult::", loginResult);
        if (loginResult) {
          username.value = userStore.username;
          await reset();