Merge remote-tracking branch 'origin/master'

zengh

2021-04-06 d7dd6cbbad5213476bd1e98d65fee6056ad4c2fc

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

@@ -86,4 +86,9 @@
    Integer selectEquipmentCount(Integer status);
   void updateexpireTime(String expireTime, String deviceNumber);
   void updateExstate(String state,String reason, String deviceNumber);

   Integer selectEqCz();
   Integer selectEqCd();
   List<Map<String, Object>> selectEqCy(String time);
   Integer selectEqCg();
}