层没有配置，从左下菜单中去掉
Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui
Merge branch 'newui' of https://github.com/lvlx/zhuyun into jack
配置，备注完善
Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui
slb云服务器配置
add feature / fix bug
Merge branch 'jack' of https://github.com/lln7777/zhuyun into merge
Merge branch 'newui' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	views/main.ejs
Merge branch 'merge' into dev