EFRS-1348: Fixed conflicts

Author: VolodymyrBushko

java/admin/src/main/java/com/exadel/frs/service/StatisticService.java

@@ -4,7 +4,7 @@
 import static org.apache.commons.lang3.Range.between;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import com.exadel.frs.commonservice.entity.InstallInfo;
-import com.exadel.frs.commonservice.entity.ModelSubjectProjection;
+import com.exadel.frs.commonservice.projection.ModelSubjectProjection;
 import com.exadel.frs.commonservice.entity.User;
 import com.exadel.frs.commonservice.exception.ApperyServiceException;
 import com.exadel.frs.commonservice.repository.InstallInfoRepository;
@@ -78,8 +78,8 @@ private List<StatisticsFacesEntity> createStatistics(String installInfoGuid, Lis
     private StatisticsFacesEntity createStatistic(String installInfoGuid, ModelSubjectProjection subjectCount) {
         return new StatisticsFacesEntity(
                 installInfoGuid,
-                subjectCount.getGuid(),
-                getSubjectRange(subjectCount.getSubjectCount())
+                subjectCount.guid(),
+                getSubjectRange(subjectCount.subjectCount())
         );
     }