From f392d5e620f5c182281e7b8f3166d4a6a93d3090 Mon Sep 17 00:00:00 2001 From: zc <zc> Date: 星期二, 03 九月 2024 12:10:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs --- src/main/java/com/zy/asrs/entity/Order.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 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..fd13474 100644 --- a/src/main/java/com/zy/asrs/entity/Order.java +++ b/src/main/java/com/zy/asrs/entity/Order.java @@ -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) { -- Gitblit v1.9.1