补充类级注释。
no message
Merge remote-tracking branch 'origin/master'

Conflicts:
	LivePPT/app/com/fever/liveppt/config/LivePPTInjectionConfigModule.java
	LivePPT/conf/evolutions/default/1.sql