Merge remote-tracking branch 'origin/master'

lin

2024-04-23 2be4713d25c0a295e3f84772dfc3faa0e4930ed2

 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;

}