Merge remote-tracking branch 'origin/dev' into test

src/main/java/com/ekexiu/portal/dao/ArticleDao.java

@@ -94,7 +94,7 @@ public abstract class ArticleDao {
	public abstract List<Article> queryProPublish(Connection con, String professorId) throws SQLException;
	
	@PageSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@OrderBy(" ORDER BY PUBLISH_TIME DESC,SHARE_ID ASC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryProPublish(Connection con, String professorId,int pageSize,int pageNo) throws SQLException;
	
@@ -113,7 +113,7 @@ public abstract class ArticleDao {
	public abstract List<Article> queryOrgPublish(Connection con, String orgId) throws SQLException;
	
	@PageSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@OrderBy(" ORDER BY PUBLISH_TIME DESC,SHARE_ID ASC")
	@Where("STATUS = '1'")
	public abstract PageQueryResult<Article> pageQueryOrgPublish(Connection con, String orgId,int pageSize,int pageNo) throws SQLException;