From a92b97225a0676c3645b72d8945542f7db2e05ae Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 07 五月 2025 11:26:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 6fe7a74..00845b6 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
@@ -26,11 +26,11 @@
/** bomID */
@Excel(name = "bomID")
- private String bomId;
+ private String bomLineId;
/** 鐖惰妭鐐笲OM ID */
@Excel(name = "鐖惰妭鐐笲OM ID")
- private String parentBomId;
+ private String bomHeaderId;
/** 鏂欏彿 */
@Excel(name = "鏂欏彿")
@@ -54,7 +54,7 @@
/** 鎬绘暟閲� */
@Excel(name = "鎬绘暟閲�")
- private BigDecimal totalNum;
+ private BigDecimal total_num;
/** 鍑嗗宸ユ椂 */
@Excel(name = "鍑嗗宸ユ椂")
--
Gitblit v1.9.3