Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

edu-auth/edu-auth-server/pom.xml

@@ -74,6 +74,11 @@
 
 		<dependency>
 			<groupId>com.keao.edu</groupId>
+			<artifactId>edu-user-client-api</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-im-api</artifactId>
 		</dependency>
 

edu-im/edu-im-server/pom.xml

@@ -62,6 +62,7 @@
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-common</artifactId>
 		</dependency>
+		
 		<dependency>
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-auth-api</artifactId>

edu-task/pom.xml

@@ -62,6 +62,7 @@
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-common</artifactId>
 		</dependency>
+		
 		<dependency>
 			<groupId>com.keao.edu</groupId>
 			<artifactId>edu-user-client-api</artifactId>

edu-user/pom.xml

@@ -18,5 +18,7 @@
 <modules>  <module>edu-user-client-api</module>
     <module>edu-user-server</module>
     <module>edu-user-biz</module>
+    <module>edu-student-server</module>
+    <module>edu-teacher-server</module>
   </modules>
 </project>