erge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

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

@@ -526,6 +526,9 @@ public class TsfDisplayController extends TsfBaseController {
 					cate.setCateNo(contents.getCateNo());
 					bestList = goodsService.getContentsCategoryGoodsList(cate);
 				}
+				if(cate.getMaxRow()<1){
+					cate.setMaxRow(20);
+				}
 
 				mav.addObject("bestGoodsList", bestList);
 			}
@@ -972,8 +975,10 @@ public class TsfDisplayController extends TsfBaseController {
 				for(Contents tempContent: cateMain.getContentsList()){
 					cate.setMaxRow(Integer.parseInt(tempContent.getStrVar1()));
 				}
+				if(cate.getMaxRow()<1){
+					cate.setMaxRow(20);
+				}
 				cate.setContentsLoc("SOM003");
-//				cate.setMaxRow(20);
 				cate.setCate1No(3000);
 				mav.addObject("bestGoodsList", goodsService.getContentsCategoryGoodsList(cate));
 			}