From 5d37a6dbff7a9158406a2a31f9eaf5ce7bd65db6 Mon Sep 17 00:00:00 2001
From: ronger <ronger-x@outlook.com>
Date: Mon, 30 Mar 2020 17:18:17 +0800
Subject: [PATCH] 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 | 2 ++
 src/main/java/com/rymcu/vertical/entity/Comment.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/rymcu/vertical/entity/Article.java b/src/main/java/com/rymcu/vertical/entity/Article.java
index e389d2c..6aefb49 100644
--- a/src/main/java/com/rymcu/vertical/entity/Article.java
+++ b/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;
 }
diff --git a/src/main/java/com/rymcu/vertical/entity/Comment.java b/src/main/java/com/rymcu/vertical/entity/Comment.java
index e8fb312..d9b71cc 100644
--- a/src/main/java/com/rymcu/vertical/entity/Comment.java
+++ b/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;