Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

 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;


}