FindBystationname实现
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/applicationContext.xml
	src/kevin/tm/action/BusAction.java
	src/kevin/tm/dao/AdminBeanMapper.java
	src/kevin/tm/dao/BusBeanMapper.java
	src/kevin/tm/dao/RouteBeanMapper.java
	src/kevin/tm/dao/RouteScheduleBeanMapper.java
	src/kevin/tm/dao/RouteScheduleMapper.java
	src/kevin/tm/dao/StationBeanMapper.java
	src/kevin/tm/dao/TicketBeanMapper.java
	src/kevin/tm/dao/TicketMapper.java
	src/kevin/tm/model/AdminBean.java
	src/kevin/tm/model/AdminBeanExample.java
	src/kevin/tm/model/BusBean.java
	src/kevin/tm/model/BusBeanExample.java
	src/kevin/tm/model/RouteBean.java
	src/kevin/tm/model/RouteBeanExample.java
	src/kevin/tm/model/RouteScheduleBean.java
	src/kevin/tm/model/RouteScheduleBeanExample.java
	src/kevin/tm/model/StationBean.java
	src/kevin/tm/model/StationBeanExample.java
	src/kevin/tm/model/TicketBean.java
	src/kevin/tm/model/TicketBeanExample.java
	src/kevin/tm/service/impl/BusServiceImpl.java
	src/kevin/tm/service/impl/StationServiceImpl.java
	src/kevin/tm/xml/AdminBeanMapper.xml
	src/kevin/tm/xml/BusBeanMapper.xml
	src/kevin/tm/xml/RouteBeanMapper.xml
	src/kevin/tm/xml/RouteScheduleBeanMapper.xml
	src/kevin/tm/xml/RouteScheduleMapper.xml
	src/kevin/tm/xml/StationBeanMapper.xml
	src/kevin/tm/xml/TicketBeanMapper.xml
	src/kevin/tm/xml/TicketMapper.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/kevin/tm/model/StationBeanExample.java