From 149d60a12ef635c2b08e4ebedfc9afa7363a6562 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 20 二月 2024 16:16:25 +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 | 6 ++++--
1 files changed, 4 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 a7856e8..2770396 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,6 +1,7 @@
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;
@@ -16,7 +17,7 @@
private Long id;
private String orderId;
private String project;
- private String customerId;
+ private Integer customerId;
private String customerName;
private String orderType;
private String orderClassify;
@@ -25,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;
@@ -55,6 +56,7 @@
private LocalDate createTime;
private LocalDate updateTime;
+ @TableField(value = "customer_id")
private Customer customer;
private FinishedGoodsInventory finishedGoodsInventory;
--
Gitblit v1.8.0