Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java

@@ -100,7 +100,7 @@ public class DistributionSignforExcel implements Serializable {
 	 * 服务类型
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送服务类型")
+	@ExcelProperty("增值服务类型")
 	private String deliveryWayName;
 	/**
 	 * 服务类型

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

@@ -1828,7 +1828,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			DistributionSignforExcel signforExcel = new DistributionSignforExcel();
 			BeanUtils.copyProperties(d, signforExcel);
 			signforExcel.setOrderCode(d.getStockArticleId());
-			signforExcel.setDeliveryTime(d.getLoadingTime());
+			signforExcel.setDeliveryTime(d.getSignLoadingDate());
 
 //			signforExcel.setConsignee();
 			String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, d.getDeliveryType());