diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java index 46902392..79f6264f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/vo/PurchaseVo.java @@ -39,7 +39,7 @@ public class PurchaseVo { @ApiModelProperty(value="出厂日期") @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") - private Date productDate; + private String productDate; @ApiModelProperty(value="到货时间") @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml index 42ed50d3..f48a3545 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseBindMapper.xml @@ -227,7 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pcd.type_id as typeId, mt.unit_name AS unitName, ms.supplier AS supplierName, - + pcd.production_time AS productDate, mt.manage_type AS manageType, pcd.`status` , pm.ma_code AS maCode,