Merge remote-tracking branch 'origin/master'

linwe

2023-11-25 8400a67289b214b83a20484410fff96d236c6d49

 src/main/java/org/springblade/modules/discuss/entity/UserPublicEnrollEntity.java

@@ -72,8 +72,8 @@

   /** 0否 1是 */
   @ApiModelProperty(value = "0否 1是", example = "")
   @TableField("delete_flag")
   @TableField("deleted_flag")
   @TableLogic
   private Integer deleteFlag;
   private Integer deletedFlag;
}