diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java b/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java
index 7d2bfae..7f25ec3 100644
--- a/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java
+++ b/src/main/java/com/readyvery/readyverydemo/src/order/OrderServiceImpl.java
@@ -210,10 +210,10 @@ public CurrentRes getCurrent(String orderId) {
 	}
 
 	private void verifyOrderCurrent(Order order) {
-		if (order.getProgress().equals(Progress.ORDER) ||
-			order.getProgress().equals(Progress.MAKE) ||
-			order.getProgress().equals(Progress.COMPLETE) ||
-			order.getProgress().equals(Progress.PICKUP)) {
+		if (order.getProgress().equals(Progress.ORDER)
+			|| order.getProgress().equals(Progress.MAKE)
+			|| order.getProgress().equals(Progress.COMPLETE)
+			|| order.getProgress().equals(Progress.PICKUP)) {
 			return;
 		}
 		throw new BusinessLogicException(ExceptionCode.ORDER_NOT_CURRENT);
diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java b/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java
index 6e4bc9c..686275a 100644
--- a/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java
+++ b/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java
@@ -222,9 +222,8 @@ public CurrentRes orderToCurrentRes(Order order) {
 			.orderNum(order.getId())
 			.progress(order.getProgress())
 			.orderName(order.getOrderName())
-			// .estimatedTime(order.getEstimatedTime().format(DateTimeFormatter.ofPattern(TIME_FORMAT)))
-			.estimatedTime(order.getEstimatedTime() != null ?
-				order.getEstimatedTime().format(DateTimeFormatter.ofPattern(TIME_FORMAT)) : null)
+			.estimatedTime(order.getEstimatedTime() != null
+				? order.getEstimatedTime().format(DateTimeFormatter.ofPattern(TIME_FORMAT)) : null)
 			.build();
 	}
 }