增加了add按钮
Merge branch 'master' into feature/js
Merge branch 'master' into feature/js

Conflicts:
	public/web/css/common-z.css
完成了js
Merge remote-tracking branch 'origin/feature/js'

Conflicts:
	public/web/js/ajax.js