Merge remote-tracking branch 'origin/master'

Administrator

2022-05-18 644ed3e30bbee9a417dfbe649f2a72df25a7efb1

 src/main/java/org/springblade/modules/system/vo/UserVO.java

@@ -108,4 +108,5 @@


   private Integer type;
   private String types;
}