Merge remote-tracking branch 'origin/master'

admin

2019-01-29 a6b1160da8cbb78a664a6dd7496bee648c7c148c

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/ShareGoodsActivityOrderService.java

@@ -43,4 +43,12 @@
    */

   public List<ShareGoodsActivityOrder> listByOrderIdAndUid(Long uid, Long orderId);



   /**

    * 根据用户ID查询订单

    * 
    * @param uid

    * @return

    */

   public List<ShareGoodsActivityOrder> listByUid(Long uid);



}