Merge remote-tracking branch 'origin/master'

linwe

2024-05-28 922b12a06599bc7118c4759571b9b9fe06a2e63d

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

@@ -63,6 +63,11 @@
   @TableField("article_type")
   private String articleType;

   /** 资讯类型 */
   @ApiModelProperty(value = "文章细类", example = "")
   @TableField("article_subcategory")
   private String articleSubcategory;

   /** 是否推荐 1：推荐   2：不推荐 */
   @ApiModelProperty(value = "是否推荐 1：推荐   2：不推荐", example = "")
   @TableField("recommend")