Merge remote-tracking branch 'origin/master'

lin

2024-04-01 02dc776fff0c37a7c9e992fe80f0bdd0528f5e7f

 src/main/java/org/springblade/modules/circle/entity/CircleLikeEntity.java

@@ -60,7 +60,7 @@
   /** 0：否 1：是 */
   @ApiModelProperty(value = "0：否 1：是", example = "")
   @TableField("delete_flag")
   @TableLogic
//   @TableLogic
   private Integer deleteFlag;

}