Merge remote-tracking branch 'origin/master'

tangzy

2021-03-26 afda08833e460a40a2d4e509f9df9d809c6f8f31

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

@@ -36,6 +36,10 @@

   IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment,List childList);
   IPage<EquipmentVO> selectPage(IPage<EquipmentVO> page, EquipmentVO equipment,String pid);


   IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid);

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