Merge branch 'develop' into bin2107

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

@@ -1843,7 +1843,7 @@
 		INNER  JOIN (SELECT G.GOODS_CD
 		                  , MIN(VS.OPT_CD) AS OPT_CD
 		                  , MIN(CASE WHEN D.DISP_NM_LANG = 'EN' THEN D.BRAND_GROUP_ENM ELSE D.BRAND_GROUP_KNM END) AS BRAND_NM
-		             FROM   TB_GOODS G
+		             FROM   TB_GOODS G USE INDEX(IX_GOODS_11)
 		             INNER  JOIN TB_BRAND BR
 		             ON     G.BRAND_CD = BR.BRAND_CD
 		             INNER  JOIN TB_BRAND_GROUP D
@@ -1855,10 +1855,10 @@
 		             ON     G.GOODS_CD = VS.GOODS_CD
 		             WHERE  1=1
 		             AND    G.GOODS_STAT = 'G008_90'
+		             AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT
 		             AND    G.GOODS_TYPE = 'G056_N'
 		             AND    G.SELF_MALL_YN = 'Y'
 		             AND    G.MIN_ORD_QTY = 1
-		             AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT
 		             AND    VS.SOLDOUT_YN = 'N'
 		             AND    VS.CURR_STOCK_QTY > 0
 		             AND    BR.USE_YN = 'Y'