Merge remote-tracking branch 'origin/master'

Administrator

2018-12-10 94c29daf7cb722635c1735e8d8bd403105e999d8

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsGroupService.java

@@ -56,7 +56,7 @@
    * @param count 数量

    * @throws UserShareGoodsRecordException

    */

   public void updateBrowseRecord(Long uid, Long auctionId, int count) throws UserShareGoodsRecordException;

   public void updateBrowseRecord(Long shareId, int count) throws UserShareGoodsRecordException;





   /**