Merge remote-tracking branch 'origin/master'

linwe

2024-05-28 922b12a06599bc7118c4759571b9b9fe06a2e63d

 src/main/java/org/springblade/modules/article/vo/ArticleVO.java

@@ -74,6 +74,8 @@

   private String houseCode;

   private Long householdId;

   private String districtId;

   private String parentId;