From eef4b7ca66cc2fb34d2d2cb0a4a8643f2bb0f838 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 18 十月 2024 13:44:06 +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/ProductDetail.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 7e8fd71..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,25 +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 prodId;
- private String sortNum;
- private String glassSort;
+ 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