Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-13 b36986a85b17c94b65e0fd5f9f5c860780738338

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

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


   private String hold;

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