From 18c0ffb02bbc0aa7eeea1d79a210260880b964f8 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 07 一月 2026 11:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
index 64aebaf..0f52118 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasController.java
@@ -115,7 +115,7 @@
     @PostMapping("/warehouseAreas/update")
     public R update(@RequestBody WarehouseAreas warehouseAreas) {
         warehouseAreas.setUpdateBy(getLoginUserId());
-        WarehouseAreas areas = warehouseAreasService.getById(warehouseAreas.getWarehouseId());
+        WarehouseAreas areas = warehouseAreasService.getById(warehouseAreas.getId());
         if (Objects.isNull(areas)) {
             throw new CoolException("鏁版嵁閿欒锛氫粨搴撳簱鍖轰笉瀛樺湪锛侊紒");
         }
@@ -132,6 +132,7 @@
             }
         }
 
+        warehouseAreas.setUpdateTime(new Date());
         if (!warehouseAreasService.updateById(warehouseAreas)) {
             return R.error("Update Fail");
         }

--
Gitblit v1.9.1