From 7f94e21461561f335ee87a387eeabf528318fce1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 24 十月 2024 16:04:33 +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 | 4 ++++
1 files changed, 4 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 8782d0d..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,6 +1,7 @@
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;
@@ -11,6 +12,8 @@
@TableId(type = IdType.AUTO)
private Long id;
private String productName;
+ private String productAbbreviation;
+ private String typeId;
private String typeName;
private Double totalThickness;
private Double thickness;
@@ -20,6 +23,7 @@
private String creator;
private LocalDate createTime;
private LocalDate updateTime;
+ @TableField(select = false)
private BasicGlassType basicGlassType;
}
--
Gitblit v1.8.0