[haiyang] add order resources
Merge remote-tracking branch 'origin/master'

Conflicts:
	melt-orm/src/main/java/com/melt/orm/mapping/Mapper.java