From b6bd7e582d6cf4812cf1de355788b7eee22eb4ac Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 07 八月 2024 15:16:15 +0800
Subject: [PATCH] 页面调整

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

diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 5aebc90..fd13474 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -93,7 +93,7 @@
      * 瀹㈡埛缂栧彿
      */
     @ApiModelProperty(value= "瀹㈡埛缂栧彿")
-    private Long cstmr;
+    private String cstmr;
 
     /**
      * 瀹㈡埛
@@ -268,9 +268,24 @@
     @TableField("move_status")
     private Integer moveStatus;
 
+    @TableField("ware_id")
+    private String wareId;
+
+    @TableField("ware_name")
+    private String wareName;
+
+    @TableField("temp1")
+    private String temp1;
+
+    @TableField("temp2")
+    private String temp2;
+
+    @TableField("temp3")
+    private String temp3;
+
     public Order() {}
 
-    public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,String cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.uuid = uuid;
         this.orderNo = orderNo;
         this.orderTime = orderTime;

--
Gitblit v1.9.1