bug:【ID1000399】

仪器管理-用户仪器绑定-记录详情只显示最新记录详情，应该显示全部记录详情
2 years ago · db29b8c6a9
parent 3e5fc898c0
commit db29b8c6a9
2 changed files with 2 additions and 1 deletions
--- 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;
--- 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>