From fb19dd3e4e7e99f3c11d91a35b5eccfb64bd4dc0 Mon Sep 17 00:00:00 2001
From: yongdaidai <7805924+yongdaidai@user.noreply.gitee.com>
Date: 星期五, 31 七月 2020 14:59:23 +0800
Subject: [PATCH] update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml. 解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
---
ruoyi-ui/src/views/error/404.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/error/404.vue b/ruoyi-ui/src/views/error/404.vue
index c21ebce..666d27c 100644
--- a/ruoyi-ui/src/views/error/404.vue
+++ b/ruoyi-ui/src/views/error/404.vue
@@ -8,13 +8,18 @@
<img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
</div>
<div class="bullshit">
- <div class="bullshit__oops">OOPS!</div>
- <div class="bullshit__info">All rights reserved
- <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
+ <div class="bullshit__oops">
+ 404閿欒!
</div>
- <div class="bullshit__headline">{{ message }}</div>
- <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div>
- <a href="" class="bullshit__return-home">Back to home</a>
+ <div class="bullshit__headline">
+ {{ message }}
+ </div>
+ <div class="bullshit__info">
+ 瀵逛笉璧凤紝鎮ㄦ鍦ㄥ鎵剧殑椤甸潰涓嶅瓨鍦ㄣ�傚皾璇曟鏌RL鐨勯敊璇紝鐒跺悗鎸夋祻瑙堝櫒涓婄殑鍒锋柊鎸夐挳鎴栧皾璇曞湪鎴戜滑鐨勫簲鐢ㄧ▼搴忎腑鎵惧埌鍏朵粬鍐呭銆�
+ </div>
+ <router-link to="/" class="bullshit__return-home">
+ 杩斿洖棣栭〉
+ </router-link>
</div>
</div>
</div>
@@ -26,7 +31,7 @@
name: 'Page404',
computed: {
message() {
- return 'The webmaster said that you can not enter this page...'
+ return '鎵句笉鍒扮綉椤碉紒'
}
}
}
--
Gitblit v1.9.3