Merge remote-tracking branch 'remotes/origin/feature/20200531'

# Conflicts:
#	src/main/java/com/kiisoo/ic/customer/CustomerService.java
#	src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
#	src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java
#	src/main/java/com/kiisoo/ic/synchronous/service/PromotionCodeService.java
#	src/main/resources/application-dev.yml
#	src/test/java/test/Test.java

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.kiisoo</groupId>
     <artifactId>ic</artifactId>
     <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <name>youke</name>
 
     <parent>