recover yinhanghuikuan
Merge branch 'master' into lichenxing

Conflicts:
	src/main/java/com/ruyicai/mgr/controller/TcashCWController.java