Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/pom.xml

@@ -9,9 +9,9 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.gree.miniapp</groupId>
-    <artifactId>zfire_jsm_mall_miniapp</artifactId>
+    <artifactId>zfire_overseas_mall_miniapp</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>zfire_overseas_mall_manager</name>
+    <name>zfire_overseas_mall_miniapp</name>
     <description>Demo project for Spring Boot</description>
 
     <properties>

mall-server-api/pom.xml

@@ -9,7 +9,7 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.gree.manager</groupId>
-    <artifactId>zfire_jsm_mall_manager</artifactId>
+    <artifactId>zfire_overseas_mall_manager</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>zfire_overseas_mall_manager</name>
     <description>Demo project for Spring Boot</description>