Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/article/vo/ArticleVo.java

@@ -44,6 +44,16 @@
   private String islikes;

   /**
    * 收藏总数
    */
   private String collectcount;

   /**
    * 是否收藏
    */
   private String iscollect;

   /**
    * 评论总数
    */
   private String comments;