Merge remote-tracking branch 'origin/dev_新疆_新聚' into dev_新疆_新聚

gaoluyang

4 天以前 fcadf16afa65a8a5ca53a33c4b8f4bf2efe2ea03

 src/api/login.js

@@ -57,4 +57,4 @@
    method: 'get',
    timeout: 20000
  })
}
}