resolved conflicts

This commit is contained in:
rajesh
2024-08-28 02:14:04 +05:30
23 changed files with 234 additions and 69 deletions

View File

@@ -3,10 +3,8 @@ package net.gepafin.tendermanagement.service.impl;
import java.util.List;
import net.gepafin.tendermanagement.dao.RegionDao;
import net.gepafin.tendermanagement.entities.RegionEntity;
import net.gepafin.tendermanagement.model.request.RegionReq;
import net.gepafin.tendermanagement.model.response.RegionResponseBean;
import net.gepafin.tendermanagement.model.request.UpdateRegionReq;
import net.gepafin.tendermanagement.service.RegionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,7 +30,7 @@ public class RegionServiceImpl implements RegionService {
@Override
@Transactional(readOnly = true)
public RegionEntity getRegionById(Long regionId) {
public RegionResponseBean getRegionById(Long regionId) {
return regionDao.getRegionById(regionId);
}