From 42bc535c947bcf999c706a753635d35ef73f91e6 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 22 四月 2024 09:11:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/ProductDetail.java | 9 +++++++--
1 files changed, 7 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..2877505 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,28 @@
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;
+import java.util.Map;
@Data
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