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

admin

2019-08-29 b99a10cff6b4c4d0965871be894fba8ba64605fc

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

         }