model完善
Merge branch 'master' of https://github.com/lantianlz/aoaoxc

Conflicts:
	www/car_wash/urls.py