Merge remote-tracking branch 'origin/master'

zengh

2022-01-06 d536920d3a707c85031047a8732dabf21ad87743

 src/main/java/org/springblade/modules/likes/vo/LikesVO.java

@@ -14,10 +14,4 @@
@EqualsAndHashCode(callSuper = true)
public class LikesVO extends Likes {

   @ApiModelProperty(value = "通知类型名")
   private String categoryName;

   @ApiModelProperty(value = "租户编号")
   private String tenantId;

}