Merge remote-tracking branch 'origin/master'

linwe

2024-05-17 1b4822da66a05ee7647f5f86a9f18f15dadb0a25

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

@@ -43,11 +43,11 @@
   private Integer id;

   /**
    * 用户id
    * 住户id
    */
   @ApiModelProperty(value = "用户id", example = "")
   @TableField("user_id")
   private Long userId;
   @ApiModelProperty(value = "住户id", example = "")
   @TableField("household_id")
   private Long householdId;

   /**
    * 议题id