From fb7900864924f3fda76462fb3b8c6c60d8ee4860 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 13 Jun 2024 19:58:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=BB=B4=E6=8A=A4=E7=AD=BE=E6=94=B6=E5=A4=8D=E6=A0=B8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E5=A2=9E=E5=8A=A0=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/DistributionSignforStockArticleVO.java | 20 +++++++++++++++++++
 .../mapper/DistributionStockArticleMapper.xml |  1 +
 2 files changed, 21 insertions(+)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
index 7bf35c4eb..2dc3771a9 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforStockArticleVO.java
@@ -212,6 +212,26 @@ public class DistributionSignforStockArticleVO implements Serializable {
 	@ApiModelProperty(value = "签收扫描时间")
 	private Date scanSigningTime;
 
+	/**
+	 * 签收复核时间
+	 */
+	@ApiModelProperty(value = "签收复核时间")
+	private Date signingTime;
+
+
+	/**
+	 * 司机签收时间
+	 */
+	@ApiModelProperty(value = "司机签收时间")
+	private Date sjsigningTime;
+
+
+	/**
+	 * 签收复核时间
+	 */
+	@ApiModelProperty(value = "司机签收时间")
+	private Date signingTime;
+
 
 	/**
 	 * 创建时间
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 3e809e19e..b50ad67b0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -1471,6 +1471,7 @@
         ldrs.reservation_num AS reservationNum,
         lds.examine_user_name AS examineUserName,
         lds.signing_time AS signingTime,
+        lds.sjsigning_time AS sjsigningTime,
         lddl.train_number AS trainNumber,
         lddl.vehicle_name AS vehicleName,
         lddl.driver_name AS driverName