Merge remote-tracking branch 'origin/master'

lin

2024-03-29 f193d5d14359b882af1ec10daf03dd69b04753b7

 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;

}