Merge remote-tracking branch 'origin/master'

lin

2024-04-10 d3c223eaa4df46d17c138ef8ed5eab8da9638416

 src/main/java/org/springblade/modules/doorplateAddress/vo/FuncNode.java

@@ -48,6 +48,11 @@
   private String roleType;

   /**
    * 颜色（房屋标签对应的颜色）
    */
   private String houseColor;

   /**
    * 居住状态
    */
   private String residentialStatus;