update coupon validityTime
Merge branch 'master' into lichenxing

Conflicts:
	src/main/webapp/WEB-INF/views/coupon/createChannelAndCoupon.jsp