修改振伦需要的接口以及实现
机构管理 修改、删除
飞机管理 查询
修改接口
ar
新增根据航空公司查询所有飞机的接口

Conflicts:
	src/main/java/com/eighth/airrent/dao/impl/AirlineDAOImpl.java
	src/main/java/com/eighth/airrent/proxy/service/AirlineService.java
添加接口
Merge remote-tracking branch 'origin/master'
tofly管理 订单／会员／数据设置／密码修改／退出
Merge branch 'master' of https://github.com/wsjyz/airrent into work

Conflicts:
	src/main/java/com/eighth/airrent/dao/impl/AirlineDAOImpl.java
	src/main/java/com/eighth/airrent/dao/impl/AirportDAOImpl.java
	src/main/java/com/eighth/airrent/proxy/service/AirlineService.java
	src/main/java/com/eighth/airrent/proxy/service/impl/AirlineServiceImpl.java
	src/main/java/com/eighth/airrent/service/impl/AirlineServiceImpl.java