Merge remote-tracking branch 'origin/企微聊天' into 企微聊天

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -272,7 +272,7 @@ public class AppLoginController extends AppBaseController{
                 if (StringUtils.isNotEmpty(param.getJpushId())) {
                     user.setJpushId(param.getJpushId());
                 }
-//                userService.insertFsUser(user);
+                userService.insertFsUser(user);
 //                String token = jwtUtils.generateToken(user.getUserId());
 //                redisCache.setCacheObject("userToken:" + user.getUserId(), token, 604800, TimeUnit.SECONDS);
 //                map.put("token", token);