合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -41,7 +41,6 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "登录", notes = "根据登录名和验证码")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区"),
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName(登陆名(手机号)) code(验证码)"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
     })
@@ -50,7 +49,7 @@ public class UserController extends BaseController {
                               @PathVariable(value = "communityId") String communityId,
                               HttpSession session){
         JSONObject jsonObject = JSONObject.parseObject(parameter);
-        ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),communityId, jsonObject.getString("code"));
+        ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),jsonObject.getString("code"));
         TaUserVO userVO = (TaUserVO) responseBean.getData();
 
         if (null != userVO) {

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -115,7 +115,7 @@ public class TaUserServiceImpl implements ITaUserService {
         checkVerifyStatusUser(currentUser);
 
         // 查询房产
-        
+
 
         TaUserVO taUserVO = new TaUserVO();
         BeanUtils.copyProperties(currentUser, taUserVO);