Merge branch 'master' into dev

# Conflicts:
#	src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java
#	src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java
#	src/main/java/com/rymcu/vertical/util/BaiDuUtils.java
#	src/main/java/com/rymcu/vertical/web/api/comment/CommentController.java

src/main/java/com/rymcu/vertical/entity/Article.java

@@ -46,4 +46,6 @@ public class Article implements Serializable,Cloneable {
     private Date createdTime;
     /** 更新时间 */
     private Date updatedTime;
+    /** 文章状态 */
+    private String articleStatus;
 }

src/main/java/com/rymcu/vertical/entity/Comment.java

@@ -19,7 +19,7 @@ public class Comment implements Serializable,Cloneable {
     @Id
     @GeneratedValue(generator = "JDBC")
     @Column(name = "id")
-    private Integer id;
+    private Integer idComment;
     /** 评论内容 */
     @Column(name = "comment_content")
     private String commentContent;