From 9a0cf79fa57427d7a38d55ad8b33622c1dcc18aa Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 26 一月 2024 16:06:31 +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 |    8 +++++---
 1 files changed, 5 insertions(+), 3 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..7c77160 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,11 +2,13 @@
 
 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)
 
@@ -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