Merge remote-tracking branch 'origin/master'

zengh

2021-08-12 642414e16907bdd2a47642a9a83c1bc002c6b081

 src/main/java/org/springblade/modules/system/entity/User.java

@@ -157,7 +157,7 @@


   private String hold;

   private Integer status;
   /**
    * 行政区域id
    */