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:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/online/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/src/views/tool/swagger/index.vue
This commit is contained in:
疯狂的狮子li
2021-06-10 09:44:56 +08:00
parent ceeac476ec 2ace3257f9
commit 2103731f10
23 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -541,7 +541,7 @@ export default {
this.loading = false;
this.getList();
this.msgSuccess("删除成功");
})
}).catch(() => {});
}
}
};

4
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -599,7 +599,7 @@ export default {
this.loading = false;
this.getList();
this.msgSuccess("删除成功");
})
}).catch(() => {});
},
#if($table.sub)
/** ${subTable.functionName}序号 */
@ -648,7 +648,7 @@ export default {
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
})
}).catch(() => {});
}
}
};