From db29b8c6a9073f600e79877947e9dbd98f6dcab1 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 6 Feb 2024 11:35:31 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E3=80=90ID1000399=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-=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AF=A6=E6=83=85=EF=BC=8C=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8=E8=AE=B0=E5=BD=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/WxUserInstrumentServiceImpl.java        | 1 +
 flossom-ui/src/views/system/instrumentSerial/index.vue          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java
index 00982ef..97f696d 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java
@@ -33,6 +33,7 @@ public class WxUserInstrumentServiceImpl implements IWxUserInstrumentService
     private WxInstrumentMapper wxInstrumentMapper;
     @Autowired
     private WxInstrumentSerialMapper instrumentSerialMapper;
+    @Autowired
     private WxInstrumentSerialLogMapper instrumentSerialLogMapper;
     @Autowired
     private WxUserInstrumentLogMapper wxUserInstrumentLogMapper;
diff --git a/flossom-ui/src/views/system/instrumentSerial/index.vue b/flossom-ui/src/views/system/instrumentSerial/index.vue
index a18c836..1928894 100644
--- a/flossom-ui/src/views/system/instrumentSerial/index.vue
+++ b/flossom-ui/src/views/system/instrumentSerial/index.vue
@@ -278,7 +278,7 @@
         </el-table-column>
         <el-table-column label="操作时间" align="center" prop="createTime" >
           <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>