Merge branch 'dev' of http://www.ekexiu.com:3000/jiapeng/portal-web.git

into dev

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

@@ -6,6 +6,7 @@ import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.Dynamic;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
@@ -24,6 +25,7 @@ public abstract class ArticleDao {
	public abstract int insert(Connection con, Article article) throws SQLException;
	
	@Update
	@Dynamic
	public abstract int update(Connection con, Article article) throws SQLException;
	
	@UpdateWith