머지 수정

src/main/java/com/style24/front/biz/service/TsfDisplayService.java

@@ -2,12 +2,6 @@ package com.style24.front.biz.service;
 
 import java.util.Collection;
 
-<<<<<<< HEAD
-=======
-import com.style24.front.biz.dao.TsfGoodsDao;
-import com.style24.front.support.security.session.TsfSession;
-import com.style24.persistence.domain.*;
->>>>>>> refs/heads/develop
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -15,7 +9,9 @@ import org.springframework.stereotype.Service;
 import com.style24.core.biz.service.TscEnvsetService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.front.biz.dao.TsfDisplayDao;
+import com.style24.front.biz.dao.TsfGoodsDao;
 import com.style24.front.support.env.TsfConstants;
+import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.BrandGroup;
 import com.style24.persistence.domain.Cate1;
 import com.style24.persistence.domain.Cate2;
@@ -298,7 +294,7 @@ public class TsfDisplayService {
 	public Collection<Popup> getPopupList(Popup popup) {
 		popup.setSiteCd(TscConstants.Site.STYLE24.value());
 		return displayDao.getPopupList(popup);
-	}
+	} 
 
 	/**
 	 * 몰메인 MD PICK 목록