peihaoyu/forest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
# 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
This commit is contained in:
ronger 2020-03-30 17:18:17 +08:00
parent 20e6c7c944
commit 5d37a6dbff
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/rymcu/vertical/entity/Article.java
View File

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

2
src/main/java/com/rymcu/vertical/entity/Comment.java
View File

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