From 16a09540001bd00f01b848f0ca125d16bf314450 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 15:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

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

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
index 81d6fed..c41549f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
@@ -30,7 +30,7 @@
     private String matnr;
 
     @ApiModelProperty("瑙勬牸灞炴��")
-    private String specs;
+    private String spec;
 
     @ApiModelProperty("鎵规")
     private String batch;
@@ -39,7 +39,7 @@
     private Double anfme;
 
     @ApiModelProperty("渚涘簲鍟�")
-    private String supplier;
+    private String splrId;
 
     @ApiModelProperty("鍗曚綅")
     private String unit;

--
Gitblit v1.9.1