modify PromotionServiceImplTest
modify PromotionDiscountTest
git Merge branch 'master' of github.com:XueQian/pos-java-spring