更改service
更改配置文件
更改配置文件
合并后台
pom.xml中添加json有关的lib配置
Merge branch 'new051002' into dev

Conflicts:
	src/main/resources/mybatis/TrainPlanMapper.xml

合并controller,service,dao层代码
Merge branch 'dev' of https://github.com/railproject/trainplan into dev

Conflicts:
	src/main/webapp/WEB-INF/web.xml