Merge remote-tracking branch 'origin/master'

src/api/login.ts

@@ -9,7 +9,8 @@ export function login(data) {
   const params = {
     ...data,
     clientId: data.clientId || clientId,
-    grantType: data.grantType || 'password'
+    grantType: data.grantType || 'password',
+    fromSystem: data.fromSystem || 'yjxp'
   };
   params.password = encryptWithAes(params.password, parseAesKey(params.uuid));