Merge remote-tracking branch 'origin/ft-dev'

# Conflicts:
#	src/api/sys/menu.ts
#	src/views/system/menu/index.vue
#	src/views/system/password/index.vue
#	yarn.lock

@@ -13,8 +13,6 @@ tests/server/static/upload
 .env.*.local
 .env.development
 .eslintcache
-.package-lock.json
-.yarn.lock
 
 # Log files
 npm-debug.log*