From 81df1dcdb77b01b4a957b2b0725f3a91cfc0f72a Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 22 三月 2024 16:48:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
index 23d512b..47637b8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
@@ -4,12 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.example.erp.entity.mm.FinishedGoodsInventory;
 import lombok.Data;
 
 import java.time.LocalDate;
 
 @Data
-@TableName("`order`")
+@TableName("sd.`order`")
 public class Order {
     @TableId(type = IdType.AUTO)
 
@@ -54,8 +55,12 @@
     private Integer delivery;
     private LocalDate createTime;
     private LocalDate updateTime;
+    @TableField(select = false,exist = false)
+    private Integer goodsQuantity;
 
     @TableField(value = "customer_id")
     private Customer  customer;
+    @TableField(select = false)
+    private FinishedGoodsInventory finishedGoodsInventory;
 
 }

--
Gitblit v1.8.0