Merge remote-tracking branch 'origin/feature-201806-suntg' into feature-201806-suntg

src/main/java/com/uas/platform/b2b/service/impl/PurchaseNoticeServiceImpl.java

@@ -326,7 +326,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 				PurchaseNotice notice = notices.get(0);
 				notice.setEnd(Constant.YES);
 				notice.setEndStatus((short) Status.NOT_UPLOAD.value());
-				notice.setDate(new Date(System.currentTimeMillis()));
+				notice.setErpDate(new Date(System.currentTimeMillis()));
 				saveList.add(notice);
 				// 推送结案送回提醒给采购单供应商联系人
 				Long vendUserUU = notice.getOrderItem().getOrder().getVendUserUU();