From 9db0246c0e18044d5ef322cae425bbdc72f25fc3 Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Wed, 28 Sep 2022 09:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nladmin-system/src/main/java/org/nl/Test01.java | 2 ++
 nladmin-ui/src/views/system/role/index.vue      | 1 -
 nladmin-ui/src/views/system/user/index.vue      | 9 ++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 nladmin-system/src/main/java/org/nl/Test01.java

diff --git a/nladmin-system/src/main/java/org/nl/Test01.java b/nladmin-system/src/main/java/org/nl/Test01.java
new file mode 100644
index 000000000..fc4aa6a74
--- /dev/null
+++ b/nladmin-system/src/main/java/org/nl/Test01.java
@@ -0,0 +1,2 @@
+package org.nl;public class Test01 {
+}
diff --git a/nladmin-ui/src/views/system/role/index.vue b/nladmin-ui/src/views/system/role/index.vue
index b8750fb19..795285496 100644
--- a/nladmin-ui/src/views/system/role/index.vue
+++ b/nladmin-ui/src/views/system/role/index.vue
@@ -13,7 +13,6 @@
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
         />
-        <date-range-picker v-model="query.createTime" class="date-item" />
         <rrOperation />
       </div>
       <crudOperation :permission="permission" />
diff --git a/nladmin-ui/src/views/system/user/index.vue b/nladmin-ui/src/views/system/user/index.vue
index 0a43c7314..9db56a54e 100644
--- a/nladmin-ui/src/views/system/user/index.vue
+++ b/nladmin-ui/src/views/system/user/index.vue
@@ -33,12 +33,11 @@
               v-model="query.blurry"
               clearable
               size="mini"
-              placeholder="输入名称或者邮箱搜索"
+              placeholder="输入账号或者名称"
               style="width: 200px;"
               class="filter-item"
               @keyup.enter.native="crud.toQuery"
             />
-            <date-range-picker v-model="query.createTime" class="date-item" />
             <el-select
               v-model="query.enabled"
               clearable
@@ -75,7 +74,7 @@
             <el-form-item label="电话" prop="phone">
               <el-input v-model.number="form.phone" style="width: 200px;" />
             </el-form-item>
-            <el-form-item label="昵称" prop="nickName">
+            <el-form-item label="姓名" prop="nickName">
               <el-input v-model="form.nickName" style="width: 200px;" />
             </el-form-item>
             <el-form-item label="邮箱" prop="email">
@@ -141,7 +140,7 @@
         >
           <el-table-column :selectable="checkboxT" type="selection" width="55" />
           <el-table-column show-overflow-tooltip prop="username" label="用户名" />
-          <el-table-column show-overflow-tooltip prop="nickName" label="昵称" />
+          <el-table-column show-overflow-tooltip prop="nickName" label="姓名" />
           <el-table-column prop="gender" label="性别" />
           <el-table-column show-overflow-tooltip prop="phone" width="100" label="电话" />
           <el-table-column show-overflow-tooltip width="135" prop="email" label="邮箱" />
@@ -245,7 +244,7 @@ export default {
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
         nickName: [
-          { required: true, message: '请输入用户昵称', trigger: 'blur' },
+          { required: true, message: '请输入用户姓名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ]
       }