From d08f906904a74ef6a2047e1a5453a988b615e8c5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 一月 2024 16:14:35 +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 | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..f7e6716 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
@@ -2,18 +2,20 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.time.LocalDate;
@Data
+@TableName("`order`")
public class Order {
@TableId(type = IdType.AUTO)
private Long id;
private String orderId;
private String project;
-
+ private String customerId;
private String customerName;
private String orderType;
private String orderClassify;
@@ -34,13 +36,13 @@
private Double otherMoney;
private String otherMoneyRemarks;
private String processingNote;
- private String otherRemaks;
+ private String otherRemarks;
private Double area;
private Long quantity;
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;
--
Gitblit v1.8.0