From 58ea9652cdbf6e96da64112b778afa1377d10701 Mon Sep 17 00:00:00 2001 From: DYL0109 <1332079466@qq.com> Date: 星期五, 07 二月 2025 19:38:58 +0800 Subject: [PATCH] !47 !46 .. Merge pull request !47 from DYL0109/develop1.0 --- zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java index d3e754c..aa80c65 100644 --- a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java +++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/DailyKeyEquipmenteController.java @@ -76,7 +76,6 @@ }; startPage(); List<DailyKeyEquipment> list = dailykeyEquipment.getdailyKeyEquipmentList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId()); - //return AjaxResult.success(list); return getDataTable(list); } @@ -107,7 +106,6 @@ /** * 閲嶇偣鑳借�楄澶� - * @return */ @GetMapping("/getPointFacility") @ApiOperation(value = "鏌ヨ閲嶇偣璁惧鍒楄〃") -- Gitblit v1.9.3