From 4726368fb058d0f396b345eaccde0164a4aecb0b Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 31 五月 2021 13:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htwms' into htwms
---
src/main/java/zy/cloud/wms/manager/entity/Order.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Order.java b/src/main/java/zy/cloud/wms/manager/entity/Order.java
index f8176d5..116a608 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Order.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Order.java
@@ -65,6 +65,13 @@
private Long itemId;
/**
+ * 椤圭洰鍚嶇О
+ */
+ @ApiModelProperty(value= "椤圭洰鍚嶇О")
+ @TableField("item_name")
+ private String itemName;
+
+ /**
* 璋冩嫧椤圭洰缂栧彿
*/
@ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
@@ -254,12 +261,13 @@
public Order() {}
- public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,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,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) {
this.uuid = uuid;
this.orderNo = orderNo;
this.orderTime = orderTime;
this.docType = docType;
this.itemId = itemId;
+ this.itemName = itemName;
this.allotItemId = allotItemId;
this.defNumber = defNumber;
this.number = number;
@@ -392,6 +400,14 @@
this.itemId = itemId;
}
+ public String getItemName() {
+ return itemName;
+ }
+
+ public void setItemName(String itemName) {
+ this.itemName = itemName;
+ }
+
public Long getAllotItemId() {
return allotItemId;
}
--
Gitblit v1.9.1