合并冲突解决

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

@@ -1001,20 +1001,4 @@ public class IcResiUserController implements ResultDataResolver {
         List<HomeUserBriefResultDTO> r = icResiUserService.listHomeUserBrief(houseId, customerId);
         return new Result().ok(r);
     }
-
-    /**
-     * 根据房屋主键查询户内家庭成员简信息
-     *
-     * @param houseId   房屋主键
-     * @param loginUser 登录用户
-     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.HomeUserBriefResultDTO>>
-     * @author work@yujt.net.cn
-     * @date 2022/4/21/0021 15:00
-     */
-    @PostMapping("listhomeuserbrief/{houseId}")
-    public Result<List<HomeUserBriefResultDTO>> listHomeUserBrief(@PathVariable("houseId") String houseId, @LoginUser TokenDto loginUser) {
-        String customerId = loginUser.getCustomerId();
-        List<HomeUserBriefResultDTO> r = icResiUserService.listHomeUserBrief(houseId, customerId);
-        return new Result().ok(r);
-    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -274,7 +274,6 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     Map<String, BigDecimal> getDataAnalyseCount(@Param("customerId") String customerId, @Param("tableName") String tableName,
                                                 @Param("columnList") List<String> columnList, @Param("id") String id, @Param("level") String level);
-    List<Map<String, String>> getIcUserList(@Param("customerId") String customerId, @Param("columns")List<String> columns);
 
     /**
      * Desc: 根据房屋IDs查询房屋下是否有存在居民的