Merge branch 'sowon' into develop

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

@@ -297,6 +297,10 @@
 		   </choose>                       
 		FROM   TAB_PLAN_GOODS2 PG
 		INNER JOIN TAB_GOODS_IMG2 GI ON PG.GOODS_CD = GI.GOODS_CD
+		<if test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
+		LEFT OUTER JOIN TB_WISHLIST W ON PG.GOODS_CD = W.GOODS_CD
+		                             AND W.CUST_NO = #{custNo}
+		</if>
 		WHERE  (SELECT COUNT(*) FROM TAB_PLAN_GOODS) = 0
 		AND PG.NUMB <![CDATA[<=]]> #{maxRow}
 		UNION ALL