From a97c0e84c8d1f50aa65935643a580527f30b7ece Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 12 三月 2024 08:39:38 +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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 1ee2fd3..1f73f53 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,19 +1,23 @@
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;
@Data
+@TableName("sd.`order`")
public class Order {
@TableId(type = IdType.AUTO)
private Long id;
private String orderId;
private String project;
-
+ private Integer customerId;
private String customerName;
private String orderType;
private String orderClassify;
@@ -22,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;
@@ -34,13 +38,14 @@
private Double otherMoney;
private String otherMoneyRemarks;
private String processingNote;
- private String otherRemaks;
+ private String otherRemarks;
private Double area;
private Long quantity;
+ private String perimeter;
private String verifierId;
private String verifier;
- private String createrId;
- private String creater;
+ private String creatorId;
+ private String creator;
private Integer createOrder;
private Integer processReview;
private Integer orderReview;
@@ -51,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