Merge branch 'wei_master' into '105'

update

See merge request !34

src/main/java/com/server/web/controller/UserController.java

@@ -35,7 +35,9 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/userData", method = {RequestMethod.POST, RequestMethod.GET}, produces = "application/json")
     @RequestMapping(value = "/userData", method = {RequestMethod.POST, RequestMethod.GET}, produces = "application/json")
     public Map userData(HttpServletRequest request) {
     public Map userData(HttpServletRequest request) {
         TKzyUser loginUser = getLoginUser(request);
         TKzyUser loginUser = getLoginUser(request);
-
+        if (loginUser != null && loginUser.getId() != null) {
+            loginUser = tKzyUserMapper.selectByPrimaryKey(loginUser.getId());
+        }
         return returnSuccess(loginUser);
         return returnSuccess(loginUser);
     }
     }