diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/purchase/PurchaseDto.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/purchase/PurchaseDto.java index 3810fe8a..ec8d3ccd 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/purchase/PurchaseDto.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/purchase/PurchaseDto.java @@ -50,7 +50,7 @@ public class PurchaseDto { private Integer status; @ApiModelProperty(value = "出厂日期") - private Date productDate; + private String productDate; @ApiModelProperty(value = "二级明细id") private String purchaseId; 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 79f6264f..a587ae48 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 @@ -38,7 +38,6 @@ public class PurchaseVo { private String supplierName; @ApiModelProperty(value="出厂日期") - @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8") private String productDate; @ApiModelProperty(value="到货时间")