合并冲突解决

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

@@ -309,26 +309,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      */
     String updateImage(RentTenantFormDTO formDTO);
 
-    /**
-     * 租客房东黑名单查询个人数据
-     *
-     * @param formDTO
-     * @return com.epmet.dto.result.RentTenantDataResultDTO
-     * @author zhy
-     * @date 2022/4/26 16:03
-     */
-    RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO);
-
-    /**
-     * 租客房东黑名单查询个人数据
-     *
-     * @param idCard
-     * @return com.epmet.dto.result.RentTenantDataResultDTO
-     * @author zhy
-     * @date 2022/4/26 16:03
-     */
-    List<RentTenantDataResultDTO> getRentResiUserInfoByIdCard(String idCard);
-
     /**
      * 租客房东根据身份证更新头像
      *

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1734,20 +1734,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), showSqlColumns, currentStaffAgencyId, staffOrgPath, map.get("groupByTables"));
     }
 
-    @Override
-    public RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO) {
-        IcResiUserEntity entity = baseDao.selectById(formDTO.getUserId());
-        return ConvertUtils.sourceToTarget(entity, RentTenantDataResultDTO.class);
-    }
-
-    @Override
-    public List<RentTenantDataResultDTO> getRentResiUserInfoByIdCard(String idCard) {
-        Map<String, Object> params = new HashMap<>(8);
-        params.put("idCard", idCard);
-        List<IcResiUserEntity> entityList = baseDao.selectList(getWrapper(params));
-        return ConvertUtils.sourceToTarget(entityList, RentTenantDataResultDTO.class);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String updateImage(RentTenantFormDTO formDTO) {