Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 d5a8a64768db15ff6917e150358a954582e384fd

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

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