Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/Condition.java

@@ -27,7 +27,7 @@ public class Condition {
 	 * @return IPage
 	 */
 	public static <T> IPage<T> getPage(Query query) {
-		Page<T> page = new Page<>(toInt(query.getCurrent(),1), toInt(query.getSize(),10));
+		Page<T> page = new Page<T>(toInt(query.getCurrent(),1), toInt(query.getSize(),10));
 		page.setAsc(StringUtil.toStrArray(SqlKeyword.filter(query.getAscs())));
 		page.setDesc(StringUtil.toStrArray(SqlKeyword.filter(query.getDescs())));
 		return page;

cooleshow-user/user-teacher/pom.xml

@@ -69,11 +69,6 @@
 			<artifactId>easy-captcha</artifactId>
 			<version>1.6.2</version>
 		</dependency>
-        <dependency>
-            <groupId>com.github.whvcse</groupId>
-            <artifactId>easy-captcha</artifactId>
-            <version>1.6.2</version>
-        </dependency>
 	</dependencies>
 
 	<build>