Merge remote-tracking branch 'origin/master'

lin

2024-05-06 2a61dad694bad8ddcea768ac973cc0c2339a54cc

 src/api/user.js

@@ -17,7 +17,9 @@
    password,
    grant_type:"password",
    scope: "all",
    type
    type,
    // 查全部-暂定
    loginType:1
  }
});