From 5ec8d62c24fc5844d1b88a91398178856ec76b12 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 08 五月 2025 15:46:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend 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..df97283 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")
+    @Excel(name = "闇�姹侷D")
     private String requireId;
-
+    /** 闇�姹傝拷婧疘D */
+    @Excel(name = "闇�姹傝拷婧疘D")
+    private String requireTrackId;
     /** bom_line_id */
     @Excel(name = "bom_line_id")
     private String bomLineId;

--
Gitblit v1.9.3