Browse Source

合并冲突解决

feature/teamB_zz_wgh
jianjun 4 years ago
parent
commit
1f9e86293b
  1. 19
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

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

@ -95,15 +95,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
*/
PersonDataResultDTO personData(PersonDataFormDTO formDTO);
/**
* @Description 根据名字搜索
* @param formDTO
* @return com.epmet.dto.result.RentTenantDataResultDTO
* @author zhy
* @date 2022/4/26 16:03
*/
RentTenantDataResultDTO tenantData(RentTenantDataFormDTO formDTO);
/**
* @param formDTO
* @author zxc
@ -306,16 +297,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
*/
List<RentTenantDataResultDTO> getRentResiUserInfoByIdCard(String idCard);
/**
* 租客房东根据身份证更新头像
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @author zhy
* @date 2022/4/26 10:48
*/
String updateImage(RentTenantFormDTO formDTO);
/**
* 租客房东根据身份证更新头像
*

Loading…
Cancel
Save