From e51e45f2cabcc4628ce93e55c7c3806b1b760161 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 16:26:23 +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 |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 d466aaf..a410944 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
@@ -3,15 +3,19 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
+@TableName("sd.`product`")
 public class Product {
     @TableId(type = IdType.AUTO)
     private Long id;
     private String productName;
+    private String productAbbreviation;
     private String typeId;
     private String typeName;
     private Double totalThickness;
@@ -24,5 +28,7 @@
     private LocalDate updateTime;
     @TableField(select = false)
     private BasicGlassType basicGlassType;
+    @TableField(select = false,exist= false)
+    private List<ProductDetail> ProductDetails;
 
 }

--
Gitblit v1.8.0