From 209e7b490e9088e0a131b23d67da325ee115c98b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 19 二月 2024 10:40:42 +0800
Subject: [PATCH] 订单查询,新增,修改界面,以及部分实体类

---
 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 24840a4..23d512b 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 lombok.Data;
@@ -15,7 +16,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;
@@ -24,7 +25,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;
@@ -54,6 +55,7 @@
     private LocalDate createTime;
     private LocalDate updateTime;
 
+    @TableField(value = "customer_id")
     private Customer  customer;
 
 }

--
Gitblit v1.8.0