等待改图之后再打开总经理
Merge remote-tracking branch 'origin/master'

Conflicts:

	JXCSystemClient/src/main/java/businesslogicservice/promotionblservice/PromotionblService.java
	JXCSystemClient/src/main/java/vo/DiscountVO.java