Merge remote-tracking branch 'origin/master'

linwei

2024-01-18 52c95b4ca6e53ff53e43d80b58cc19b715e4533d

 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;

}