Merge branch 'develop' into bin2107

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

@@ -1135,6 +1135,7 @@
 		            AND    O.OPT_CD1 = C.COLOR_CD
 		            AND    C.COLOR_GRP_CD = CC.CD
 		            AND    O.DISP_YN = 'Y'
+					AND    C.COLOR_GRP_CD = CC.CD
 		            AND    C.USE_YN = 'Y'
 		            AND    CC.USE_YN = 'Y'
 		            GROUP  BY PG.GOODS_CD