jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Browse Source 
 Conflicts:
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
This commit is contained in:
疯狂的狮子li
2021-06-23 09:38:53 +08:00
parent c822e2f6cc 1ed60c79c0
commit d05458aa3a
5 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-ui/src/views/system/dict/index.vue
View File

@ -194,14 +194,9 @@
<script>
import { listType, getType, delType, addType, updateType, exportType, refreshCache } from "@/api/system/dict/type";
// 字典标签组件（使用频繁可在全局挂载）
import DictTag from '@/components/DictTag'
export default {
name: "Dict",
components: {
DictTag
},
data() {
return {
// 遮罩层