From 457e468312c247ef078b2db7de336baf8cc398d5 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 17:15:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
index e391b63..d88b2d4 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
@@ -22,11 +22,11 @@
/** 闇�姹侷D */
@Excel(name = "闇�姹侷D")
- private String requireId;
+ private Long requireId;
/** 闇�姹傝拷婧疘D */
@Excel(name = "闇�姹傝拷婧疘D")
- private String requireTraceId;
+ private Long requireTraceId;
/** 宸ュ崟鍙� */
@Excel(name = "宸ュ崟鍙�")
@@ -79,6 +79,7 @@
private Date planEndDay;
/** 鏈尮閰嶇殑鐢熶骇鏁伴噺*/
+ @Excel(name = "鏈尮閰嶇殑鐢熶骇鏁伴噺")
private BigDecimal unmatchedQuantity;
/** 宸ュ崟鍒涘缓鏃堕棿 */
--
Gitblit v1.9.3