qq
Merge branch 'master' of https://github.com/caining618/ytf_order_business.git
生成批次 修改批次状态
Merge branch 'master' of https://github.com/caining618/ytf_order_business.git
jgroup
qq
Merge branch 'master' of
https://github.com/caining618/ytf_order_business.git

Conflicts:
	src/main/webapp/WEB-INF/web.xml
	src/test/java/com/yeepay/ytf/order/test/CNDemoTest.java