Merge remote-tracking branch 'origin/master'

admin

2019-01-29 a6b1160da8cbb78a664a6dd7496bee648c7c148c

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/ShareGoodsActivityOrderServiceImpl.java

@@ -49,4 +49,10 @@
      return shareGoodsActivityOrderMapper.listByOrderIdAndUid(uid, orderId);

   }



   @Override

   public List<ShareGoodsActivityOrder> listByUid(Long uid) {



      return shareGoodsActivityOrderMapper.listByUid(uid);

   }



}