annotation
Merge remote-tracking branch 'origin/master'

Conflicts:
	cartman-core/src/test/java/cn/icodeit/cartman/core/ClassATest.java