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

yujian

2019-08-16 8e631ceb2c08e6cd00e68b1aa9ad1fec7cea6a72

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