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/ApsPlateStandardRequireBomOrderDetail.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java
index 6bbf5c7..80cbc87 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java
@@ -26,9 +26,13 @@
 
     private Long id;
 
+    /** 闇�姹侷D */
+    @Excel(name = "闇�姹侷D")
+    private String requireId;
+
     /** 闇�姹傝拷婧疘D */
     @Excel(name = "闇�姹傝拷婧疘D")
-    private String requireId;
+    private String requireTrackId;
 
     /** bom_line_id */
     @Excel(name = "bom_line_id")

--
Gitblit v1.9.3