设备集合查询

zengh

2021-04-08 f1595ff272b3e2c6d774ae435df66707a8056f33

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

@@ -93,8 +93,8 @@
   @GetMapping("/listAll")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入equipment")
   public R<List<EquipmentVO>> listAll(Equipment equipment, Query query) throws ParseException {
      List<EquipmentVO> pages = equipmentService.listAll();
   public R<List<EquipmentVO>> listAll(EquipmentVO equipment, Query query) throws ParseException {
      List<EquipmentVO> pages = equipmentService.listAll(equipment);

      for (int j = 0; j < pages.size(); j++) {
         String expireTime = pages.get(j).getExpireTime();