菜单信息录入，数据库调整
Merge remote-tracking branch 'origin/master'