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

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

@@ -410,7 +410,7 @@
 		   AND GC.COMPS_GOODS_CD = #{compsGoodsCd}
 		 INNER JOIN TB_OPTION                    OP
 		    ON IFNULL(GC.COMPS_GOODS_CD, G.GOODS_CD) = OP.GOODS_CD
-		   AND OP.OPT_CD2 = #{optCd}
+		   AND OP.OPT_CD = #{optCd}
 		 WHERE OD.ORD_DTL_NO = #{ordDtlNo}
 	</insert>