From d80640689e6949780811f4f8d1c8c972dbd4aa0b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 八月 2019 16:54:04 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java
index db4bd04..bba8948 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/pdd/PDDOrderServiceImpl.java
@@ -42,6 +42,7 @@
 				update.setGoodsName(order.getGoodsName());
 				update.setGoodsPrice(order.getGoodsPrice());
 				update.setUpdateTime(new Date());
+				update.setOrderReceiveTime(order.getOrderReceiveTime());
 				pddOrderMapper.updateByPrimaryKeySelective(update);
 				return pddOrderMapper.selectByPrimaryKey(old.getId());
 			}

--
Gitblit v1.8.0