Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -560,7 +560,7 @@ public class MQTask implements InitializingBean {
 	/**
 	 * 查询维修超时数据并短信通知
 	 */
-	@Scheduled(cron = "0 0 9 * * ?")//每天上午午9点触发
+	@Scheduled(cron = "0 50 8 * * ?")//每天上午午9点触发
 /*	@Scheduled(cron = "0 0/1 * * * ?")//每2分钟执行一次*/
 	public void detectTimeoutNotice() throws Exception {
 		logger.info("---------------- 询维修超时数据并短信通知开始 ---------------");