From 5dac37cde0205be965c2b74dd1bddefc7f9cceda Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 26 三月 2025 08:56:57 +0800
Subject: [PATCH] Merge branch 'integrationWms' into mdqzasrs

---
 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 15a23ed..23f6b0d 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -55,7 +55,7 @@
 	@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
 	private String maktx;
 
-	@ApiModelProperty(value= "搴忓垪鐮�")
+	@ApiModelProperty(value= "鎵瑰彿")
 	private String batch;
 
 	@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -108,7 +108,7 @@
 	private Double weight;
 
 	@ApiModelProperty(value= "闀垮害")
-	private Double length;
+	private Double man_length;
 
 	@ApiModelProperty(value= "浣撶Н")
 	private Double volume;

--
Gitblit v1.9.1