From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/entity/Order.java | 16 +++++++++++++++-
1 files changed, 15 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 99abc64..de1f901 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -163,7 +163,7 @@
private String salesman;
/**
- * 缁撶畻澶╂暟
+ * setMemo
*/
@ApiModelProperty(value= "缁撶畻澶╂暟")
@TableField("account_day")
@@ -261,6 +261,20 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "erp浠撳簱缂栫爜")
+ @TableField("plt_type")
+ private Integer pltType;
+
+ /**
+ * 鍏ュ簱鏃ユ湡
+ */
+ @ApiModelProperty(value= "鍏ュ簱鏃ユ湡")
+ @TableField("in_time")
+ private String InTime;
+
+ @TableField("Upstreamcode")
+ private String Upstreamcode;
+
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) {
--
Gitblit v1.9.1