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

src/main/java/com/ekexiu/portal/service/ArticleService.java

@@ -630,7 +630,6 @@ public class ArticleService {
						this.articleOrgDao.insert(con, articleOrg);
					}
				}
				return article.getArticleId();
			} else {
				throw new JfwBaseException(-2, "bad parameter:articleId");
			}