Merge branch 'master' of http://git.zthymaoyi.com/zyw/cloudNew

.gitignore

@@ -42,7 +42,7 @@ mvnw.cmd
 ### target ###
 /target/
 /unimall-admin-api/target/
-/unimall-app-api/target/
+#/unimall-app-api/target/
 /unimall-biz/target/
 /unimall-data/target/
 /unimall-core/target/

pom.xml

@@ -38,7 +38,7 @@
 		<module>unimall-core</module>
 		<module>unimall-data</module>
 		<module>unimall-biz</module>
-		<module>unimall-app-api</module>
+<!--		<module>unimall-app-api</module>-->
 		<module>unimall-admin-api</module>
 		<module>unimall-launcher</module>
 		<module>unimall-plugin-core</module>

unimall-launcher/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.iotechn</groupId>
@@ -21,11 +21,6 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>com.iotechn</groupId>
-			<artifactId>unimall-app-api</artifactId>
-			<version>0.0.1-RELEASE</version>
-		</dependency>
 
 		<dependency>
 			<groupId>com.iotechn</groupId>