Merge remote-tracking branch 'origin/master'

Administrator

2022-07-13 798ab07db6464f24e353dcdf8397506ab246c91d

 src/main/java/org/springblade/modules/friend/entity/Friend.java

@@ -69,4 +69,10 @@
   @ApiModelProperty(value = "申请状态")
   private String type;

   /**
    * 备注
    */
   @ApiModelProperty(value = "备注")
   private String bz;

}