Merge remote-tracking branch 'origin/div' into div

admin

2019-09-09 61c21f17b1ad94e4b0018c7e385195bab21b0b5c

 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());

         }