Merge branch 'dev' of ssh://10.10.101.21/source/platform-b2b

src/main/java/com/uas/platform/b2b/erp/service/impl/NoticeRecordServiceImpl.java

@@ -42,7 +42,7 @@ public class NoticeRecordServiceImpl implements NoticeRecordService {
     @Override
     public void check(List<PurchaseNotify> notifyList) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-        Long time = System.currentTimeMillis() - 2 * 60 * 60 * 1000;
+        Long time = System.currentTimeMillis() - 1 * 60 * 60 * 1000;
         final String describe = dateFormat.format(new Date(System.currentTimeMillis()))
                 + "~" + dateFormat.format(new Date(time)) + " 送货提醒取消记录";
         final Enterprise enterprise = SystemSession.getUser().getEnterprise();