--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java

@@ -218,7 +218,7 @@ public class FgPermissionsController {
 	
 	@ApiOperation(value = "微信用户登录", notes = "0：登录成功；5：该账户已禁用；6：第三方登录错误；7：未绑定平台账号")
 	@PostMapping(value =MemberRequestPath.WECHAT + MemberRequestPath.LOGIN)
-	public CallBack<String> wechartLogin(@RequestBody WeChartThirdReturn cb) throws BaseException, Exception {
+	public CallBack<Member> wechartLogin(@RequestBody WeChartThirdReturn cb) throws BaseException, Exception {
 		Member member = mService.loginWechat(cb.getOpenid());
 		if(member == null){
 			member = new Member();
@@ -245,7 +245,7 @@ public class FgPermissionsController {
 			e.printStackTrace();
 		}
 		logger.info("打印微信key"+token);
-		return CallBack.success(token);
+		return CallBack.success(member);
 		/*
 		 * CallBack<WeChartThirdReturn> cb = weChatLogin.query(code); try {
 		 * logger.info(JsonUtil.bean2Json(cb)); } catch (IOException e) {