From fc272a7cfa14984096dc7b5dd77c129d59a95b6a Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Mon, 16 Jun 2025 15:49:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8E=82=E6=97=A5=E6=9C=9F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/purchase/domain/vo/PurchaseVo.java | 2 +- .../resources/mapper/material/purchase/PurchaseBindMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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,