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

src/main/java/com/style24/persistence/mybatis/wms/TsbWmsDelivery.xml

@@ -665,9 +665,9 @@
 	<select id="getWmsOrdFreeGiftCnt" parameterType="Delivery" resultType="int">
 		/* TsbWmsDelivery.getWmsOrdFreeGiftCnt */
 		SELECT COUNT(1)
-		FROM   dbo.TB_IF_DeliveryOrder DO
-		INNER  JOIN dbo.TB_IF_DeliveryOrderItem DOI
-		ON     DO.DeliveryOrderNo = DOI.DeliveryOrderNo 
+		FROM   istyle24_Wmsif.dbo.TB_IF_DeliveryOrder DO
+		INNER  JOIN istyle24_Wmsif.dbo.TB_IF_DeliveryOrderItem DOI
+		ON     DO.DeliveryOrderNo = DOI.DeliveryOrderNo
 		WHERE  1=1
 		AND    DO.OrderNo = #{orderno}
 		AND    DOI.GiftYn = 'Y'

src/main/resources/config/application-style.yml

@@ -117,7 +117,7 @@ cron:
     #배송
     delivery:
         shot.deliveryzone.refresh: 0 10 2 * * *        #총알배송 권역정보 갱신(매일 11시) (1일 1회)
-        loc.assign: 0 4/10 7-16 * * *            #출고처 지정 및 배송(출고) 지시 (1시간 1회)
+        loc.assign: 0 4/10 7-15 * * *            #출고처 지정 및 배송(출고) 지시 (1시간 1회)
         wms:
             outgoing.exception.receive: 0 1/10 7-20 * * MON-FRI #WMS 출고예외 수신 (1시간 1회)
             outgoing.result.receive: 0 5/10 7-22 * * MON-FRI    #WMS 출고결과 수신 (1시간 1회)