From e4f170cdada3484d5b31b4294854dffb78ffa799 Mon Sep 17 00:00:00 2001
From: root <zxsoft>
Date: Sun, 31 May 2020 01:30:51 +0800
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 644d279..ee65903 100644
--- a/pom.xml
+++ b/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>