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

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

@@ -10,7 +10,10 @@
 				FROM (  SELECT FG.FREEGIFT_SQ
 							 , FG.FREEGIFT_NM
 							 , FG.FREEGIFT_STAT
-							 , (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD = FG.FREEGIFT_STAT) AS FREEGIFT_STAT_NM
+		                     , CASE WHEN FG.FREEGIFT_STAT = 'G232_11' AND FG.FREEGIFT_EDDT <![CDATA[ < ]]>  NOW()
+		                                 THEN '종료'
+		                            ELSE (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD = FG.FREEGIFT_STAT)
+		                       END                                       AS FREEGIFT_STAT_NM
 							 , FG.SELF_YN
 							 , DATE_FORMAT(FG.FREEGIFT_STDT, '%Y.%m.%d') AS FREEGIFT_STDT
 							 , DATE_FORMAT(FG.FREEGIFT_EDDT, '%Y.%m.%d') AS FREEGIFT_EDDT