Merge remote-tracking branch 'origin/master'

linwei

2024-01-19 f3dac2f82e3a6e2836a15a66df4bafd4f5cfd733

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

@@ -68,4 +68,13 @@

   private Integer eventType;

//   private List<List<String>> articleList;


   private String houseCode;

   private String districtId;

   private String parentId;

}