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

zengh

2021-01-29 83bed9e77878cbe11e797b58fa2c2a48061e4555

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java

@@ -106,6 +106,9 @@
   private String pay;
   private String expireTime;
   private String heartbeat;
   private String province;
   private String city;
   private String district;


}