From feddd20a4323e49ef9f424d07e53c12e715203fc Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期二, 13 五月 2025 14:45:20 +0800
Subject: [PATCH] 修改冲突

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 e43b215..a481f6d 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
@@ -105,4 +105,6 @@
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 //    @Excel(name = "鑷畾涔夋棩鏈�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
 //    private Date customTime;
+
+    private Integer requireNum;
 }

--
Gitblit v1.9.3