From a1a27eba473c476cade23f003d3ac1f1cc1ac27d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 01 三月 2024 15:14:50 +0800
Subject: [PATCH] 报工明细表字段修改

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 7c77160..28c5ed8 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
@@ -1,8 +1,10 @@
 package com.example.erp.entity.sd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+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;
@@ -15,7 +17,7 @@
     private Long id;
     private String orderId;
     private String project;
-
+    private Integer customerId;
     private String customerName;
     private String orderType;
     private String orderClassify;
@@ -24,7 +26,7 @@
     private String deliveryDate;
     private String batch;
     private Integer calculateType;
-    private String salesmanId;
+    private Integer salesmanId;
     private String salesman;
     private String alType;
     private Double money;
@@ -39,6 +41,7 @@
     private String otherRemarks;
     private Double area;
     private Long quantity;
+    private String perimeter;
     private String verifierId;
     private String verifier;
     private String creatorId;
@@ -53,6 +56,9 @@
     private LocalDate createTime;
     private LocalDate updateTime;
 
+    @TableField(value = "customer_id")
     private Customer  customer;
+    @TableField(select = false)
+    private FinishedGoodsInventory finishedGoodsInventory;
 
 }

--
Gitblit v1.8.0