Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-11 db0b070e51db46e779b8d2ad1d4d213b712602cd

 src/main/java/org/springblade/modules/equipment/entity/Equipment.java

@@ -108,6 +108,8 @@
   private String serialNumber;
   private String stype;
   private String channelNumber;
   private String pay;
   private String expireTime;


}