충돌 수정

src/main/java/com/style24/core/biz/service/TscWmsService.java

@@ -194,7 +194,16 @@ public class TscWmsService {
 		sData.setOrdNo(ordNo);
 		sData.setOrdChgSq(ordChgSq);
 		wmsDao.updateWmsRecallCancel(sData);
+	}
 
+	/**
+	 * WMS 회수지시 여부 조회
+	 *
+	 * @param WmsDelivery
+	 * @return Collection<WmsDelivery>
+	 * @author card007
+	 * @since 2021. 06. 16
+	 */
 	public Collection<WmsDelivery> getWmsWithdrawRequestInfo(WmsDelivery wmsDelivery) {
 		return wmsDao.getWmsWithdrawRequestInfo(wmsDelivery);
 	}