diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
index 10885ae..4abf591 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
@@ -119,10 +119,10 @@ public class AppController extends BaseController
      * 根据设备id获取更多浇水记录
      */
     @GetMapping("/getWateringRecord")
-    public TableDataInfo wateringRecord(String deviceId)
+    public TableDataInfo wateringRecord(AsWateringRecord asWateringRecord)
     {
         startPage();
-        List<AsWateringRecord> asWateringRecords = asWateringRecordService.selectAsWateringRecordList(AsWateringRecord.builder().deviceId(Long.parseLong(deviceId)).build());
+        List<AsWateringRecord> asWateringRecords = asWateringRecordService.selectAsWateringRecordList(AsWateringRecord.builder().deviceId(asWateringRecord.getDeviceId()).build());
         return getDataTable(asWateringRecords);
     }