From 99bfa55e580535304111fd4dce5c48c850bbecce Mon Sep 17 00:00:00 2001 From: 廖井涛 <2265517004@qq.com> Date: 星期一, 22 一月 2024 08:47:30 +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浠g爜 瀹炰綋绫荤殑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