Merge remote-tracking branch 'origin/master'

lin

2024-04-15 bdcca1cd1f1c4c5d7d187d74a7c75f1caac8b491

 src/main/java/org/springblade/modules/discuss/vo/PublicDiscussVO.java

@@ -36,6 +36,11 @@

   private Integer topsCount;

   private Long UserId;
   private Long householdId;
   private String userName;

   private String houseCode;

   private Boolean disabled;

}