From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001 From: guoyujie <guoyujie@ng.com> Date: 星期四, 12 六月 2025 16:48:35 +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/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