From bcb1185bfbcedced606240aa3808468578513e0b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 22 一月 2024 08:43:28 +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/Product.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java
index 4555cb9..cce3bdf 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java
@@ -4,21 +4,24 @@
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
+
+
+import java.time.LocalDate;
+
@Data
public class Product {
@TableId(type = IdType.AUTO)
- private Integer id;
- private String prodID;
- private String product;
- private String glassType;
+ private Long id;
+ private String productName;
private String typeName;
private Double totalThickness;
private Double thickness;
- private String Query;
+ private String query;
private String remarks;
private Integer state;
private String creator;
- private String createTime;
- private String updateTime;
+ private LocalDate createTime;
+ private LocalDate updateTime;
+ private BasicGlassType basicGlassType;
}
--
Gitblit v1.8.0