bug:【ID1000394】

仪器管理-用户仪器绑定导出文档【保修到期时间】和列表的不一致

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")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "保修到期时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "保修到期时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date guaranteeEndtime;
 
     /** 绑定状态，1未绑定，2已解绑 */

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">

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" >