From c0f6fb84a98db212b0780f44430d4e0cdf1b0302 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 10 九月 2025 15:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
index de6eddf..396bc7f 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
@@ -220,7 +220,7 @@
return AjaxResult.error("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
}
AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
- success.put("boxNum",keyCollectionInfo.getBoxNum());
+ success.put("boxNumber",keyCollectionInfo.getBoxNum());
logger.info("鎴愬姛杩斿洖{}",success);
return success;
}
@@ -235,7 +235,7 @@
smartLockerApplication.setReceiveTime(new Date());
smartLockerApplicationMapper.updateSmartLockerApplication(smartLockerApplication);
AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
- success.put("boxNum",smartLockerApplication.getLockerPort());
+ success.put("boxNumber",smartLockerApplication.getLockerPort());
logger.info("鎴愬姛杩斿洖{}",success);
return success;
}
--
Gitblit v1.8.0