修改了airlinePlan表的一些BUG
Merge branch 'develop' of gitcafe.com:reyoung1110/ASIMS into develop

Conflicts:
	app/models/AirlinePlan.java
Merge branch 'develop' of gitcafe.com:reyoung1110/ASIMS into develop
Merge