Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

 src/main/java/org/springblade/modules/equipage/entity/Equipage.java

@@ -91,7 +91,7 @@
   @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   @TableField("purchase_time")
   private Integer purchaseTime;
   private Date purchaseTime;

   /**
    * 装备类型