Merge remote-tracking branch 'origin/master'

linwe

2024-06-24 3e19054b66343df9138362f51bc7ca0f18ffbd68

 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;