上传及视频上传优化
套样式
测试乱码的代码
111
添加前台到系统
添加忽略
删除上传的图片与视频
Merge branch 'NewBeeZhange'
Merge branch 'daze'
加
Merge branch 'master' of https://github.com/xinmifeng/iBus_back

Conflicts:
	sqlDb.php
修改bannnerMgr.php的冲突
修改banner