Merge remote-tracking branch 'origin/master'

yujian

2019-07-12 9d8dfb01ff72c57abad3b80f3d65e81a5354db03

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

@@ -24,7 +24,7 @@
    * @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);
   
   
   /**