Merge remote-tracking branch 'origin/master'

lin

2024-04-22 747b6f5b34642e7b1d0dab1246ee6e88424ea45e

 src/api/user.js

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