Merge remote-tracking branch 'origin/master'

zengh

2021-03-23 ba0f00cf00c2a5c693e9608a56d1f7d032f5e216

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

@@ -112,6 +112,8 @@
   private String province;
   private String city;
   private String district;
   private String state;
   private String reason;


}