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

yujian

2019-09-11 f1aa196ca63b8c287c5af61214881259c13db69b

 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);
   
   
   /**