From cb52e113cc85fdab78509132280f309287fe5163 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Wed, 27 Dec 2023 16:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=BD=A6=E6=AC=A1=E5=8F=B7,=E8=BD=A6=E7=89=8C?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/entity/DistributionParcelListEntity.java   | 6 ++++++
 .../distribution/mapper/DistributionParcelListMapper.xml    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
index 851a8a1aa..622362a56 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java
@@ -96,6 +96,12 @@ public class DistributionParcelListEntity extends TenantEntity {
 	@ApiModelProperty(value = "配送车次")
 	@TableField(exist = false)
 	private String dvehicleName;
+	/**
+	 * 配送车牌
+	 */
+	@ApiModelProperty(value = "配送车牌")
+	@TableField(exist = false)
+	private String vehicleName;
 	/**
 	 * 实际装车人
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index 995c89acb..fa194dfa5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -143,7 +143,8 @@
         lddl.note_number noteNumber,
         ldl.signing_time signingTimes,
         ldl.signing_user signingUser,
-        ldl.scan_user scanUser
+        ldl.scan_user scanUser,
+        ldl.vehicle_name vehicleName
         FROM
         logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id