From 01824c5104590b96a3040faa317969bcd812bcca Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 08:17:04 +0800
Subject: [PATCH] Merge branch 'xgmFlasrs' into xgmFlasrs2 hebing
---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 18 +++++++++++++++++-
1 files changed, 17 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..6da8e74 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,22 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 璁㈠崟鍙�
+ */
+ @TableField("out_order_no")
+ private String outOrderNo;
+
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("pg_no")
+ private String sPgNO;
+
+
+
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
--
Gitblit v1.9.1