From c26bb1aef89d6d0c3301dbcac638b1fc9e0e63d1 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 12 五月 2025 17:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java
index 25fc2b1..20283c2 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java
@@ -28,9 +28,11 @@
private Long id;
/** 闇�姹傝拷婧疘D */
+ @Excel(name = "闇�姹侷D")
+ private Long requireId;
+ /** 闇�姹傝拷婧疘D */
@Excel(name = "闇�姹傝拷婧疘D")
- private String requireId;
-
+ private String requireTrackId;
/** bom_line_id */
@Excel(name = "bom_line_id")
private String bomLineId;
--
Gitblit v1.9.3