Merge remote-tracking branch 'origin/master'

admin

2019-05-15 3be3f6e670d2e11d7ced76b8202f0ef30b56870f

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

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