合并错误

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -1001,9 +1001,6 @@ public class IcResiUserController implements ResultDataResolver {
         List<HomeUserBriefResultDTO> r = icResiUserService.listHomeUserBrief(houseId, customerId);
         return new Result().ok(r);
     }
-    @PostMapping("getResiUserGroupHomeId")
-    Result<List<HouseIcResiUserResultDTO>> getResiUserGroupHomeId(@RequestBody RentTenantDataFormDTO formDTO) {
-        return new Result().ok(icResiUserService.getResiUserGroupHomeId(formDTO));
 
     /**
      * 根据房屋id,查询居民信息表中-家庭信息-本人  的居民。如果有多个，返回最近一个
@@ -1031,8 +1028,13 @@ public class IcResiUserController implements ResultDataResolver {
         return new Result<SyncResiResDTO>().ok(icResiUserService.checkUser(tokenDto.getCustomerId(), formDto.getIdCard(), formDto.getAgencyId()));
     }
 
-    @PostMapping("getHouseMemberList")
-    Result<List<HouseIcResiUserResultDTO>> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO) {
-        return new Result().ok(icResiUserService.getHouseMemberList(formDTO));
+    /**
+     * desc:条件获取房屋内的居民 按房屋分组
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("getResiUserGroupHomeId")
+    Result<List<HouseIcResiUserResultDTO>> getResiUserGroupHomeId(@RequestBody RentTenantDataFormDTO formDTO) {
+        return new Result().ok(icResiUserService.getResiUserGroupHomeId(formDTO));
     }
 }