Merge remote-tracking branch 'origin/master'

Administrator

2021-12-06 0cabea1fb1196c666b6e676e0f3446815c4ae82f

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

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


   private Integer type;
   private String types;
}