Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_0614

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -524,7 +524,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			LOGGER.error("接收地址不能为空");
 			return;
 		}
-		if("STUDENT".equals(jpushType) && type != STUDENT_PUSH_VIP_BUY){
+		if(messageSender == MessageSender.JIGUANG && "STUDENT".equals(jpushType) && type != STUDENT_PUSH_VIP_BUY){
 			//如果不是缴费信息
 			int hour = DateUtil.getHour(new Date());
 			//如果当前时间在22点之后