From 319dfc2de3db01f11ccdda006e8555a5f06a6e1b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 09 十月 2019 17:21:43 +0800
Subject: [PATCH] 修改函数命名防止冲突
---
ruoyi-ui/src/views/system/user/index.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index c340d74..2d57670 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -100,7 +100,7 @@
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="160">
<template slot-scope="scope">
- <span>{{ dateFormat(scope.row.createTime) }}</span>
+ <span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -414,6 +414,7 @@
deptId: 100,
userName: undefined,
nickName: undefined,
+ password: undefined,
phonenumber: undefined,
email: undefined,
sex: undefined,
--
Gitblit v1.9.2