From 797fce4ad48f7b70dc08766068b64f35ee9d4775 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期五, 01 十一月 2024 14:31:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index dc1d4eb..af3d074 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -156,14 +156,25 @@
*/
@TableField("out_order_no")
private String outOrderNo;
-
-
/**
* 宸ュ崟鍙�
*/
@TableField("pg_no")
private String sPgNO;
+ @TableField("pro_type")
+ private String proType;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("lu_hao")
+ private String luHao;
+
+
+ @TableField("packing")
+ private String packing;
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
--
Gitblit v1.9.1