Merge remote-tracking branch 'origin/master'

admin

2019-01-29 a6b1160da8cbb78a664a6dd7496bee648c7c148c

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/ShareGoodsActivityOrderMapper.java

@@ -25,4 +25,12 @@
    * @return
    */
   List<ShareGoodsActivityOrder> listByOrderIdAndUid(@Param("uid") Long uid, @Param("orderId") Long orderId);
	
	
   /**
    * 根据用户查询
    * @param uid
    * @return
    */
   List<ShareGoodsActivityOrder> listByUid(@Param("uid") Long uid);
}