FIX some conflicts

 git add --all src/*
 git add push.sh
 git add pom.xml
-git commit -m "Add json jar."
+git commit -m "FIX some conflicts"
 git push origin zhaoyue-dev2
 git status
\ No newline at end of file

@@ -103,8 +103,9 @@ public class UserInfoController {
     public ResponseEntity<ResultModel> getUserInfo(HttpServletRequest request,@CurrentUser User user,
                                                    @RequestParam String sign,@RequestParam long t,@RequestParam int type) {
 
-        String dickName=user.getLoginAccount();
-        return new ResponseEntity<>(ResultModel.ok(dickName), HttpStatus.OK);
+        long member_id=user.getMemberId();
+        XklMemberEntity xklMemberEntity=xklMemberRespository.findOne(member_id);
+        return new ResponseEntity<>(ResultModel.ok(xklMemberEntity), HttpStatus.OK);
     }
 
 }