From 088a46dc697ef5b719f1ab62c9988f96a21e5e0c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 11:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
index f59dde3..ee59f31 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
@@ -3,7 +3,10 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.Date;
@@ -86,4 +89,9 @@
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
+ private String mainItemCode;
+ private BigDecimal mainStock;
+ private BigDecimal subStock;
+ private String selfMade;
+
}
--
Gitblit v1.9.3