Merge branch 'master' of https://github.com/gaoxiang114/parkingarea.git

Conflicts:
	README.txt
新建user类
修改user类

Signed-off-by: gaoxiang114 <gaoxiang114@163.com>