From 223cba9fa496be3174c047e122cbb85d6fa7764d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 09:56:56 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
index 4e8c095..3f2c2d4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
@@ -66,6 +66,21 @@
     @ApiModelProperty(value= "鍗曟嵁鐘舵��")
     private Long orderSettle;
 
+    @ApiModelProperty("鐗╂祦鍚嶇О")
+    private String logisticsName;
+
+    @ApiModelProperty("鏀惰揣鍦板潃")
+    private String address;
+
+    @ApiModelProperty("鑱旂郴鐢佃瘽")
+    private String phone;
+
+    @ApiModelProperty("蹇�掑崟鍙�")
+    private String logistics;
+
+    @ApiModelProperty("璁㈠崟鏁伴噺")
+    @TableField(exist = false)
+    private Double waitQty;
     /**
      * 鎵�灞炴満鏋�
      */

--
Gitblit v1.9.1