Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

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

   /** 公益报名与议事表id */