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

yujian

2019-11-12 151eabd2384ad1004e176a469f1c62935f6d4b34

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