Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/java/com/style24/front/biz/web/TsfDisplayController.java

@@ -47,6 +47,7 @@ import com.style24.persistence.domain.Lookbook;
 import com.style24.persistence.domain.MainLayout;
 import com.style24.persistence.domain.Plan;
 import com.style24.persistence.domain.Popup;
+import com.style24.persistence.domain.SearchKeyword;
 import com.style24.persistence.domain.Social;
 import com.style24.persistence.domain.eigene.Eigeneai.Result;
 import com.style24.persistence.domain.searchengine.AutoCompleteResponse;
@@ -54,7 +55,6 @@ import com.style24.persistence.domain.searchengine.Filter;
 import com.style24.persistence.domain.searchengine.GoodsListResponse;
 import com.style24.persistence.domain.searchengine.PlanningResponse;
 import com.style24.persistence.domain.searchengine.SearchEngine;
-import com.style24.persistence.domain.SearchKeyword;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -933,7 +933,7 @@ public class TsfDisplayController extends TsfBaseController {
 		mav.addObject("preview", cate.getPreview());
 		mav.addObject("viewDt", cate.getViewDt());
 		mav.addObject("viewPage", "G037_32");
-		mav.addObject("popupCateNo", cate.getCate1No());
+		//mav.addObject("popupCateNo", cate.getCate1No());
 
 		mav.addObject("params", cate);