From f1d897f92489b20e3fe7c0d392fc85c829e52cd8 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 6 Feb 2024 11:51:43 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E3=80=90ID1000394=E3=80=91=20=20=20=20=20?=
 =?UTF-8?q?=E4=BB=AA=E5=99=A8=E7=AE=A1=E7=90=86-=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BB=AA=E5=99=A8=E7=BB=91=E5=AE=9A=E5=AF=BC=E5=87=BA=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E3=80=90=E4=BF=9D=E4=BF=AE=E5=88=B0=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E3=80=91=E5=92=8C=E5=88=97=E8=A1=A8=E7=9A=84=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flossom/common/core/domain/entity/WxUserInstrument.java   | 4 ++--
 flossom-ui/src/views/system/instrumentSerial/index.vue        | 2 +-
 flossom-ui/src/views/system/userInstrument/index.vue          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserInstrument.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserInstrument.java
index 0e13b39..2d31db2 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserInstrument.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserInstrument.java
@@ -50,8 +50,8 @@ public class WxUserInstrument extends BaseEntity
 
 
     /** 保修到期时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "保修到期时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "保修到期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date guaranteeEndtime;
 
     /** 绑定状态，1未绑定，2已解绑 */
diff --git a/flossom-ui/src/views/system/instrumentSerial/index.vue b/flossom-ui/src/views/system/instrumentSerial/index.vue
index d1b6810..1542def 100644
--- a/flossom-ui/src/views/system/instrumentSerial/index.vue
+++ b/flossom-ui/src/views/system/instrumentSerial/index.vue
@@ -153,7 +153,7 @@
       <el-table-column label="来源" align="center" prop="source" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/flossom-ui/src/views/system/userInstrument/index.vue b/flossom-ui/src/views/system/userInstrument/index.vue
index 57f88c4..030476b 100644
--- a/flossom-ui/src/views/system/userInstrument/index.vue
+++ b/flossom-ui/src/views/system/userInstrument/index.vue
@@ -137,7 +137,7 @@
       <el-table-column label="保修年限" align="center" prop="guarantee" />
       <el-table-column label="保修到期时间" align="center" prop="guaranteeEndtime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.guaranteeEndtime, '{y}-{m}-{d} {h}:{m}') }}</span>
+          <span>{{ parseTime(scope.row.guaranteeEndtime, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="绑定状态" align="center" prop="bindingStatus" >