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/sd/Product.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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 cce3bdf..4555cb9 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,24 +4,21 @@
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
-
-
-import java.time.LocalDate;
-
@Data
public class Product {
@TableId(type = IdType.AUTO)
- private Long id;
- private String productName;
+ private Integer id;
+ private String prodID;
+ private String product;
+ private String glassType;
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 LocalDate createTime;
- private LocalDate updateTime;
+ private String createTime;
+ private String updateTime;
- private BasicGlassType basicGlassType;
}
--
Gitblit v1.8.0