Merge branch 'dev_contract' into develop

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

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

@@ -1712,10 +1712,9 @@ 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 tenantData(RentTenantDataFormDTO formDTO) {
-        IcResiUserEntity entity = selectById(formDTO.getUserId());
+        IcResiUserEntity entity = baseDao.selectById(formDTO.getUserId());
         return ConvertUtils.sourceToTarget(entity, RentTenantDataResultDTO.class);
     }