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 @@
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
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 @@
- {{ parseTime(scope.row.guaranteeEndtime, '{y}-{m}-{d} {h}:{m}') }}
+ {{ parseTime(scope.row.guaranteeEndtime, '{y}-{m}-{d} {h}:{i}') }}