1.商配打印模板数据修改

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -3256,11 +3256,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				String fileTypeName = QRCodeUtil.createCodeToFile(reservationEntity.getReservationCode());
 				map.put("配送单二维码",QRCodeUtil.getEmpAutograph(fileTypeName));
 				map.put("收货单单位",reservationEntity.getReceivingUnit());//收货单单位
-				map.put("商场名称",reservationEntity.getStoreName());//商场名称
+				map.put("商城名称",reservationEntity.getStoreName());//商场名称
 				map.put("收货人",reservationEntity.getConsignee());//收货人
-				map.put("收货人电话",reservationEntity.getDeliveryPhone());//收货人电话
-				map.put("收货人地址",reservationEntity.getDeliveryAddress());//收货人地址
-				map.put("配送时间",taskTime);//配送时间
+				map.put("联系电话",reservationEntity.getDeliveryPhone());//收货人电话
+				map.put("收货地址",reservationEntity.getDeliveryAddress());//收货人地址
+				map.put("送货日期",taskTime);//配送时间
 				map.put("承运商",deliveryListEntity.getDistributionCompany());
 				map.put("配送仓库",deliveryListEntity.getWarehouseName());
 				map.put("出库时间",taskTime);