Merge remote-tracking branch 'origin/master'

linwei

2024-01-17 f5539e2f8e35d7e53abf54409245c5c7f9d2a72a

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

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

   /**