From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 | 19 ++++++++++++-------
1 files changed, 12 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..dc7fb55 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
@@ -1,24 +1,29 @@
package com.example.erp.entity.sd;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
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 productAbbreviation;
+ private String typeId;
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;
+ @TableField(select = false)
+ private BasicGlassType basicGlassType;
}
--
Gitblit v1.8.0