merge : w2-3 to w2-4

Author: Hchanghyeon

src/main/java/com/programmers/springweekly/ConsoleApplication.java

@@ -45,4 +45,5 @@ public void run(String... args) {
             }
         }
     }
+
 }

src/main/java/com/programmers/springweekly/ConsoleCustomer.java

@@ -83,4 +83,5 @@ private void getBlackList() {
 
         console.outputGetCustomerList(customerBlacklistResponse);
     }
+
 }

src/main/java/com/programmers/springweekly/ConsoleVoucher.java

@@ -77,4 +77,5 @@ private void selectVoucher() {
 
         console.outputGetVoucherAll(voucherListResponse);
     }
+
 }

src/main/java/com/programmers/springweekly/VoucherProgramApplication.java

@@ -9,5 +9,5 @@ public class VoucherProgramApplication {
     public static void main(String[] args) {
         SpringApplication.run(VoucherProgramApplication.class, args);
     }
+    
 }
- 

src/main/java/com/programmers/springweekly/domain/CustomerMenu.java

@@ -14,4 +14,5 @@ public static CustomerMenu from(String type) {
             throw new IllegalArgumentException("Input: " + type + ", 찾으시는 고객 메뉴가 없습니다.");
         }
     }
+    
 }

src/main/java/com/programmers/springweekly/domain/ProgramMenu.java

@@ -13,4 +13,5 @@ public static ProgramMenu from(String type) {
             throw new IllegalArgumentException("Input: " + type + ", 찾으시는 프로그램 메뉴가 없습니다.");
         }
     }
+    
 }

src/main/java/com/programmers/springweekly/domain/VoucherMenu.java

@@ -13,4 +13,5 @@ public static VoucherMenu from(String type) {
             throw new IllegalArgumentException("Input: " + type + ", 찾으시는 바우처 메뉴가 없습니다.");
         }
     }
+    
 }

src/main/java/com/programmers/springweekly/domain/customer/Customer.java

@@ -1,10 +1,9 @@
 package com.programmers.springweekly.domain.customer;
 
+import java.util.UUID;
 import lombok.Builder;
 import lombok.Getter;
 
-import java.util.UUID;
-
 @Getter
 public class Customer {
 
@@ -20,4 +19,5 @@ public Customer(UUID customerId, String customerName, String customerEmail, Cust
         this.customerEmail = customerEmail;
         this.customerType = customerType;
     }
+
 }

src/main/java/com/programmers/springweekly/domain/customer/CustomerType.java

@@ -15,4 +15,5 @@ public static CustomerType from(String type) {
     public static boolean isBlacklistedCustomer(CustomerType customerType) {
         return customerType == CustomerType.BLACKLIST;
     }
+    
 }

src/main/java/com/programmers/springweekly/domain/voucher/FixedAmountVoucher.java

@@ -31,4 +31,5 @@ public long getVoucherAmount() {
     public VoucherType getVoucherType() {
         return VoucherType.FIXED;
     }
+    
 }