合并冲突

2022-05-06 22:51:45 +08:00
parent c1d8040fd5
commit 10d512470e
3 changed files with 4 additions and 4 deletions
--- a/Yi.Vue2.x/src/views/AdmUser.vue
+++ b/Yi.Vue2.x/src/views/AdmUser.vue
@@ -104,7 +104,7 @@ export default {
    axiosUrls: {},
    headers: [
      { text: "用户名", value: "userName", sortable: false },
-      { text: "密码", value: "password", sortable: false },
+
      { text: "图标", value: "icon", sortable: false },
      { text: "昵称", value: "nick", sortable: true },
      { text: "邮箱", value: "email", sortable: true },