修改SDKbug
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/eighth/airrent/proxy/service/PlaneService.java
	src/main/java/com/eighth/airrent/proxy/service/UserService.java
修改SDKbug,添加字段
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/eighth/airrent/proxy/service/AirlineService.java
	src/main/java/com/eighth/airrent/proxy/service/UserService.java