Merge branch 'stage_tsit' of https://style24@dev.azure.com/style24/style24/_git/style24.admin into stage_tsit

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

@@ -215,7 +215,7 @@
 		               AND    DAY <![CDATA[>=]]> DATE_ADD(STR_TO_DATE(#{startDt},'%Y-%m-%d'), INTERVAL -1 YEAR)
 		               AND    DAY <![CDATA[<]]> DATE_ADD(DATE_ADD(STR_TO_DATE(#{endDt},'%Y-%m-%d'), INTERVAL 1 DAY), INTERVAL -1 YEAR)
 		               AND    (
-		                       1 = 1
+		                       1 = 2
 		               <if test='frontGbP != null and frontGbP != ""'>
 		                       OR FRONT_GB = 'P'
 		               </if>
@@ -233,7 +233,7 @@
 	                       </foreach>
 	                   </if>
 		               AND    (
-		                       1 = 1
+		                       1 = 2
 		               <if test='distributionGbWms != null and distributionGbWms != ""'>
 		                       OR DISTRIBUTION_GB = 'WMS'
 		               </if>
@@ -289,7 +289,7 @@
 		AND    SOD.DAY <![CDATA[>=]]> STR_TO_DATE(#{startDt},'%Y-%m-%d')
 		AND    SOD.DAY <![CDATA[<]]> DATE_ADD(STR_TO_DATE(#{endDt},'%Y-%m-%d'), INTERVAL 1 DAY)
 		AND    (
-		        1 = 1
+		        1 = 2
 		<if test='frontGbP != null and frontGbP != ""'>
 		        OR SOD.FRONT_GB = 'P'
 		</if>
@@ -307,7 +307,7 @@
 	        </foreach>
 		</if>
 		AND    (
-		        1 = 1
+		        1 = 2
 		<if test='distributionGbWms != null and distributionGbWms != ""'>
 		        OR SOD.DISTRIBUTION_GB = 'WMS'
 		</if>
@@ -2692,8 +2692,7 @@
 		                         THEN FN_DEC_AES(CELL_PHNNO)
 					   ELSE CELL_PHNNO
 				  END                                AS CELL_PHNNO
-				, FN_DEC_AES(EMAIL) AS EMAIL
-				, SUBSTRING(FN_DEC_AES(BIRTH_YMD), 1, 6) AS BIRTH_YM
+				, FN_DEC_AES(EMAIL) AS EMAIL				, SUBSTRING(FN_DEC_AES(BIRTH_YMD), 1, 6) AS BIRTH_YM
 			FROM TB_CUSTOMER
 			WHERE CUST_NO > 0
 				AND CUST_STAT = 'G104_10'