Merge remote-tracking branch 'origin/master'

zengh

2021-03-24 f34a510629676ebf22d75bde2e89e2fe4a2f56be

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

@@ -80,4 +80,6 @@
    * @return
    */
    Integer selectEquipmentCount(Integer status);
   void updateexpireTime(String expireTime, String deviceNumber);
   void updateExstate(String state,String reason, String deviceNumber);
}