Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-21 299e3b3ae10786a5b00124333a3e732009f83295

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

         }