Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.batch into develop

src/main/java/com/style24/persistence/mybatis/shop/TsbDisplay.xml

@@ -116,7 +116,7 @@
 		            AND    G.BRAND_CD = B.BRAND_CD
 		            AND    G.GOODS_TYPE != 'G056_N' /*일반상품이 아닌넘*/
 		            AND    G.GOODS_STAT = 'G008_90' /*승인된상품*/
-		            AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
+		         --   AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
 		            AND    G.SELF_MALL_YN = 'Y' /*자사몰에노출하는넘만*/
 		            AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한판매기간*/
 		            AND    GC.USE_YN = 'Y' /*사용하는구성상품*/
@@ -448,7 +448,7 @@
 		    AND    C4.CATE_TYPE = 'G031_10' /*상품카테고리*/
 		    AND    G.GOODS_TYPE != 'G056_N' /*일반상품이 아닌넘*/
 		    AND    G.GOODS_STAT = 'G008_90' /*승인된상품*/
-		    AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
+		  --  AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
 		    AND    G.SELF_MALL_YN = 'Y' /*자사몰에노출하는넘만*/
 		    AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한판매기간*/
 		    AND    I.SIZE_GB IS NOT NULL
@@ -1113,7 +1113,7 @@
 		    AND    C4.CATE_TYPE = 'G031_10' /*상품카테고리*/
 		    AND    G.GOODS_TYPE != 'G056_N' /*일반상품이아닌넘*/
 		    AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
-		    AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
+		  --  AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
 		    AND    G.SELF_MALL_YN = 'Y' /*몰노출상품*/
 		    AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한판매기간*/
 		    AND    GS.SOLDOUT_YN = 'N' /*품절이아닌넘*/

src/main/java/com/style24/persistence/mybatis/shop/TsbGoods.xml

@@ -1699,7 +1699,7 @@
 		AND    GC.COMPS_GOODS_CD = S.GOODS_CD
 		AND    G.GOODS_TYPE != 'G056_N' /*일반상품이 아닌넘*/
 		AND    G.GOODS_STAT = 'G008_90' /*승인된상품*/
-		AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
+		-- AND    G.SELF_GOODS_YN = 'Y' /*자사상품만(세트상품과 딜상품은 자사상품만)*/
 		AND    G.SELF_MALL_YN = 'Y' /*자사몰에노출하는넘만*/
 		AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한판매기간*/
 		AND    GC.USE_YN = 'Y' /*사용하는구성상품*/