From 3ad02364ce97ab8188d18c52695c8b57b1e47ea6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 23 一月 2024 08:40:37 +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/Order.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/Order.java b/north-glass-erp/src/main/java/com/example/erp/entity/Order.java
index 9855e45..ba47e17 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/Order.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/Order.java
@@ -2,23 +2,25 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
+@TableName("`order`")
public class Order {
@TableId(type = IdType.AUTO)
private Integer id;
- private String orderid;
- private String recipeno;
- private String largeglassno;
- private String largeglasscompleted;
- private String smallglassno;
- private String smallglasscompleted;
- private String smallglassprocessing;
- private String smallglassworn;
- private String orderstatus;
- private String ordermaker;
- private String maketime;
- private String updatetime;
+ private String orderId;
+ private String recipeNo;
+ private String largeglassNo;
+ private String largeglassCompleted;
+ private String smallglassNo;
+ private String smallglassCompleted;
+ private String smallglassProcessing;
+ private String smallglassWorn;
+ private String orderStatus;
+ private String orderMaker;
+ private String makeTime;
+ private String updateTime;
}
--
Gitblit v1.8.0