New changelist
...
改为oracle数据源
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/cashway/service/VtmService.java
	src/main/java/com/cashway/service/impl/VtmServiceImpl.java