Merge remote-tracking branch 'origin/master'

linwe

2023-12-23 9b8cf1c18a25f2322791a7d2fd268b42f2e01fa1

 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;

}