合并冲突解决

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

@@ -298,6 +298,16 @@ 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);
+
     /**
      * 租客房东根据身份证更新头像
      *

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

@@ -1640,6 +1640,20 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     }
 
+    @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);
+    }
+
     /**
      * @Author sun
      * @Description 【人房】居民总数饼图
@@ -1734,20 +1748,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) {
@@ -1774,21 +1774,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return resiUserId;
     }
 
-
-    @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(TokenDto tokenDto, RentTenantFormDTO formDTO) {