From 3599feef955e2dcf974ecefeaeb7b28cacb97a73 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 19 四月 2025 08:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 34cade8..c4583a2 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "搴忓垪鐮�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -151,6 +151,15 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp1;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp2;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp3;
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp4;
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
--
Gitblit v1.9.1