From a83665da9378e66f2e83299037133191f976b4da Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 17 Oct 2024 18:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E5=AE=A1=E6=A0=B8=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/material/domain/PurchasePartDetails.java | 6 +++---
 .../material/service/impl/PurchaseAccessoryServiceImpl.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java
index f6dfa2e..ef33bac 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java
@@ -135,7 +135,7 @@ public class PurchasePartDetails extends BaseEntity
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "入库时间")
-    private Date inputTime;
+    private String inputTime;
 
     /** 入库人 */
     @ApiModelProperty(value = "入库人")
@@ -402,11 +402,11 @@ public class PurchasePartDetails extends BaseEntity
         this.modelId = modelId;
     }
 
-    public Date getInputTime() {
+    public String getInputTime() {
         return inputTime;
     }
 
-    public void setInputTime(Date inputTime) {
+    public void setInputTime(String inputTime) {
         this.inputTime = inputTime;
     }
 
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java
index 4952ec0..c744786 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java
@@ -259,7 +259,7 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService {
                 if ("1".equals(partDetails.getCheckResult())) {
                     partDetails.setStatus(3);
                     partDetails.setInputNum(partDetails.getCheckNum());
-                    partDetails.setInputTime(DateUtils.getNowDate());
+                    partDetails.setInputTime(DateUtils.getNowDate().toString());
 
                     partDetails.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
                     partDetails.setUpdateTime(DateUtils.getNowDate());