Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -315,6 +315,7 @@ public class AppLoginController extends AppBaseController{
                 String token = jwtUtils.generateToken(user.getUserId());
                 map.put("token", token);
                 map.put("isNew", true);
+                map.put("user", user);
                 map.put("unionid",unionid);
                 return R.ok(map);
             } else {
@@ -335,6 +336,7 @@ public class AppLoginController extends AppBaseController{
                     String token = jwtUtils.generateToken(user.getUserId());
                     map.put("token", token);
                     map.put("isNew", true);
+                    map.put("user", user);
                     map.put("unionid",user.getUnionId());
                     return R.ok(map);
                 }