From a8378db2feef3b08edc0a6594bec187051d3b754 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 13:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/ProductDetail.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/ProductDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/ProductDetail.java
index 16ee224..f24622a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/ProductDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/ProductDetail.java
@@ -1,23 +1,30 @@
 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 com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 
 import java.time.LocalDate;
+import java.util.Map;
 
 
 @Data
+@TableName("sd.`product_detail`")
 public class ProductDetail    {
     @TableId(type = IdType.AUTO)
     private Long id;
-    private String productName;
+    private Long prodId;
+    private Integer sortNum;
+    private Integer glassSort;
     private String detailType;
     private String detail;
+    private Integer glassGroup;
     private String process;
     private String separation;
     private LocalDate createTime;
-
+    @TableField(select = false)
     private Product product;
 }
\ No newline at end of file

--
Gitblit v1.8.0