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

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

@@ -136,7 +136,7 @@
 		            ELSE (SELECT IFNULL(MAX(CASE WHEN SOLDOUT_YN = 'Y' THEN 0
 		                                      ELSE CURR_STOCK_QTY
 		                                      END) ,0)
-		                  FROM  VW_STOCK_EXTEND
+		                  FROM  VW_STOCK_COMPOSE
 		                  WHERE GOODS_CD= G.GOODS_CD
 		                  GROUP BY GOODS_CD )
 		            END) AS STOCK_QTY
@@ -250,7 +250,7 @@
 		                          WHEN #{frontGb} = 'M' THEN CURR_MO_STOCK_QTY
 		                          ELSE CURR_PC_STOCK_QTY
 		                     END) AS STOCK_QTY
-		          FROM VW_STOCK_EXTEND
+		          FROM VW_STOCK_COMPOSE
 		          WHERE SOLDOUT_YN = 'N'
 		          GROUP BY GOODS_CD) S1
 		    WHERE G.GOODS_NUM = (SELECT GOODS_NUM FROM TB_GOODS WHERE GOODS_CD = #{goodsCd})