tradeType
Merge branch 'master' of ssh://git@github.com/usercore/mjdics.git

Conflicts:
	mjdics-web/target/m2e-wtp/web-resources/META-INF/maven/com.magic.promotion.web/promotion-web/pom.properties