Merge remote-tracking branch 'origin/master'

tangzy

2021-12-04 ef8c725ba73fea5b88bb7f77684639ddf8e51e95

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

@@ -222,5 +222,6 @@
    */
   @TableField("equipment_code")
   private String equipmentCode;
   private String types;

}