Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/article/entity/Article.java

@@ -86,4 +86,14 @@
    * 是否推荐  1：推荐  2：不推荐
    */
   private Integer recommend;

   /**
    * 发布状态 0:未发布 1:已发布
    */
   private String publish;

   /**
    * 开启评论区 0:关闭 1:开启
    */
   private String iscomment;
}