From d5a4e5c81ef37c5dc23ba286fffebfaf59e04ba3 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 08:03:37 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

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

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
index 785efca..0416ab5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
@@ -206,7 +206,7 @@
         return null;
     }
 
-    public String getSupplier$() {
+    public String getSupplierId$() {
         CompanysService service = SpringUtils.getBean(CompanysService.class);
         Companys supplier = service.getById(this.supplierId);
         if (!Cools.isEmpty(supplier)){

--
Gitblit v1.9.1