供求页面
Merge branch 'master' of https://github.com/ycaihappy/mu

Conflicts:
	code/webroot/protected/models/Supply.php