From ce7423ed32c2a427fe508909c41b9cd0dbfd2f58 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 20 一月 2025 15:18:26 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/entity/OrderLog.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderLog.java b/src/main/java/com/zy/asrs/entity/OrderLog.java
index 22b61c0..71e7fd9 100644
--- a/src/main/java/com/zy/asrs/entity/OrderLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderLog.java
@@ -260,6 +260,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 OrderLog() {}
public OrderLog(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