Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue · 78ef398257 - Gogs

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

 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/src/store/modules/permission.js

疯狂的狮子li 4 years ago

parent

805c79506b 52264b6e2a

commit

78ef398257

1 changed files with 0 additions and 1 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 1
						
ruoyi-ui/src/store/modules/permission.js
							 
								View File
							
				@@ -74,7 +74,6 @@ function filterChildren(childrenMap) {
			
				           }
			
				           children.push(c)
			
				         })
			
				-        childrenMap.splice(index, 1)
			
				         return
			
				       }
			
				     }