From 2b27d322bb0cbe2a4df3da36e43d3b25960d3c3c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 17 三月 2026 10:45:19 +0800
Subject: [PATCH] 许可更新

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

diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index bbfd19e..6bca05b 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -165,7 +165,7 @@
     /**
      * 缁撶畻澶╂暟
      */
-    @ApiModelProperty(value= "缁撶畻澶╂暟")
+    @ApiModelProperty(value= "0榛樿锛�1宸茬敓鎴愬叆搴撻�氱煡妗�")
     @TableField("account_day")
     private Integer accountDay;
 
@@ -268,6 +268,21 @@
     @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,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) {
@@ -352,6 +367,15 @@
         }
         return null;
     }
+    public String getTemp$(){
+        if(!Cools.isEmpty(this.temp1)) {
+            return this.temp1;
+        }
+        if(!Cools.isEmpty(this.temp2)) {
+            return this.temp2;
+        }
+        return "";
+    }
 
     public String getPayType$(){
         if (null == this.payType){ return null; }

--
Gitblit v1.9.1