Merge remote-tracking branch 'origin/master'

tangzy

2021-12-04 ef8c725ba73fea5b88bb7f77684639ddf8e51e95

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

@@ -217,5 +217,11 @@
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
   @TableField("audit_time")
   private Date auditTime;
   /**
    * 押运人员设备编号
    */
   @TableField("equipment_code")
   private String equipmentCode;
   private String types;

}