Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-22 bb21e20b0542a3f23a12b0811c5e242783108ee5

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

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

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

}