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