From 68d7be0814e89ef811c2e7c435dff7af64ea60c1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 03 十二月 2024 10:11:21 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/BasicDataProduce.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/BasicDataProduce.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/BasicDataProduce.java
index 408944d..61cbfee 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/BasicDataProduce.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/BasicDataProduce.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.example.erp.entity.sd.BasicData;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -15,4 +16,6 @@
     private String basicCategory;
     private LocalDate createTime;
     private LocalDate updateTime;
+    private BasicData basicData;
+
 }

--
Gitblit v1.8.0