Authored by zhaoyue

FIX some conflicts

1 git add --all src/* 1 git add --all src/*
2 git add push.sh 2 git add push.sh
3 git add pom.xml 3 git add pom.xml
4 -git commit -m "Add json jar." 4 +git commit -m "FIX some conflicts"
5 git push origin zhaoyue-dev2 5 git push origin zhaoyue-dev2
6 git status 6 git status
@@ -103,8 +103,9 @@ public class UserInfoController { @@ -103,8 +103,9 @@ public class UserInfoController {
103 public ResponseEntity<ResultModel> getUserInfo(HttpServletRequest request,@CurrentUser User user, 103 public ResponseEntity<ResultModel> getUserInfo(HttpServletRequest request,@CurrentUser User user,
104 @RequestParam String sign,@RequestParam long t,@RequestParam int type) { 104 @RequestParam String sign,@RequestParam long t,@RequestParam int type) {
105 105
106 - String dickName=user.getLoginAccount();  
107 - return new ResponseEntity<>(ResultModel.ok(dickName), HttpStatus.OK); 106 + long member_id=user.getMemberId();
  107 + XklMemberEntity xklMemberEntity=xklMemberRespository.findOne(member_id);
  108 + return new ResponseEntity<>(ResultModel.ok(xklMemberEntity), HttpStatus.OK);
108 } 109 }
109 110
110 } 111 }