Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

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

@@ -226,6 +226,7 @@
 		   AND O.DISP_YN = 'Y'
 		   AND OD.ORD_DTL_STAT <![CDATA[<>]]> 'G013_25'
 		   AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
+		   AND O.REG_DT > 20210901
 		</where>
 				) Z
 		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.GIFT_LIMIT_DT, Z.GIFT_LIMIT_DAY, Z.GIFT_COMPLETE_DT, GIFT_ADDR_INP_YN, Z.DELV_EDDT, Z.AUTO_DECIDE_LEFT_DAY
@@ -279,6 +280,7 @@
 		           AND O.ORD_NO = #{ordNo}
 			</otherwise>
 		</choose>
+		           AND O.REG_DT > 20210901
 		         GROUP BY O.ORD_NO
 		       ) Z
 	</select>
@@ -326,6 +328,7 @@
 		   AND O.ORD_NO = #{ordNo}
 			</otherwise>
 		</choose>
+		   AND O.REG_DT > 20210901
 		 GROUP BY O.ORD_NO
 		<include refid="selectForPagingFooter"/>
 	</select>

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

@@ -631,6 +631,7 @@
 				</otherwise>
 			</choose>
 		</if>
+		           AND O.REG_DT > 20210901
 		  ) Z
 		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.CHG_QTY, Z.ORD_DT, Z.CHG_DATE, Z.CHG_TIME, Z.CHG_ORD_DTL_NO, Z.CHG_STAT, Z.CHG_STAT_NM, Z.CHG_REASON
 		        , Z.ORD_NO, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM, Z.GOODS_TYPE, Z.LIST_PRICE
@@ -720,6 +721,7 @@
 				</otherwise>
 			</choose>
 		</if>
+		           AND O.REG_DT > 20210901
 		         GROUP BY OCD.ORD_CHG_SQ
 		       ) Z
 	</select>
@@ -807,6 +809,7 @@
 				</otherwise>
 			</choose>
 		</if>
+		 AND O.REG_DT > 20210901
 		 GROUP BY OCD.ORD_CHG_SQ
 		<include refid="selectForPagingFooter"/>
 	</select>