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

src/main/java/com/style24/persistence/domain/Lookbook.java

@@ -33,6 +33,7 @@ public class Lookbook extends TscBaseDomain {
 	private int dispOrd;        //표시순서
 	private String mainDispYn;     //메인노출여부
 	private String mode;			//신규,수정
+	private String frontYn;
 
 	private Integer lookbookbSq;	// 룩북배너일련번호
 	private String orgFileNm;		// 원본파일명

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

@@ -55,7 +55,9 @@
 		SELECT	COUNT(*) AS TOTCNT
 		FROM	TB_LOOKBOOK
 		WHERE	1=1
-		AND 	DISP_YN = 'Y'
+		<if test='frontYn != null and frontYn != ""'>
+		AND DISP_YN = 'Y'
+		</if>
 		<if test="dispEddt != null and dispEddt !=''">
 		<![CDATA[
 		AND DISP_STDT <= STR_TO_DATE(CONCAT(#{dispEddt},#{dispEdTime}),'%Y-%m-%d %H:%i:%S')
@@ -104,7 +106,9 @@
 		       ,UPD_DT
 		FROM	TB_LOOKBOOK
 		WHERE	1=1
-		AND 	DISP_YN = 'Y'
+		<if test='frontYn != null and frontYn != ""'>
+			AND DISP_YN = 'Y'
+		</if>
 		<if test="dispEddt != null and dispEddt !=''">
 		<![CDATA[
 		AND DISP_STDT <= STR_TO_DATE(CONCAT(#{dispEddt},#{dispEdTime}),'%Y-%m-%d %H:%i:%S')