Merge branch 'wei_master' into '105'

update

See merge request !32

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

@@ -97,6 +97,7 @@ public class UserController extends BaseController {
             return returnError("0", "用户未登录", null);
             return returnError("0", "用户未登录", null);
         }
         }
 
 
+        loginUser = tKzyUserMapper.selectByPrimaryKey(loginUser.getId());
         String wxOpenId = request.getParameter("wxOpenId");
         String wxOpenId = request.getParameter("wxOpenId");
         String fullName = request.getParameter("fullName");
         String fullName = request.getParameter("fullName");
         String userCategory = request.getParameter("userCategory");
         String userCategory = request.getParameter("userCategory");