合并冲突解决

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -284,17 +284,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      **/
     List<UserChartResultDTO> userChartList(UserChartFormDTO formDTO);
 
-    /**
-     * 根据房屋主键查询户内家庭成员简信息
-     *
-     * @param houseId    房屋主键
-     * @param customerId 客户ID
-     * @return java.util.List<com.epmet.dto.result.HomeUserBriefResultDTO>
-     * @author work@yujt.net.cn
-     * @date 2022/4/21/0021 15:02
-     */
-    List<HomeUserBriefResultDTO> listHomeUserBrief(String houseId, String customerId);
-
     List<Map<String,Object>> dynamicQuery(String loginUserCustomerId, String formCode, String icResiUser, List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, List<ResiUserQueryValueDTO> conditions, String agencyId, String finalStaffOrgPath);
 
     /**