resolve conflict file CtrlConsumer
Merge branch 'master' of https://github.com/huhuo/car-rental.git

Conflicts:
	server/car-module-consumer/src/main/java/com/huhuo/cmconsumer/consumer/CtrlConsumer.java