Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/share/UserShareGoodsRecordMapper.java

@@ -19,31 +19,34 @@
   int updateByPrimaryKeySelective(UserShareGoodsRecord record);

   int updateByPrimaryKey(UserShareGoodsRecord record);
	

   /**
    * 查询用户对应的分享记录
    * 
    * @param start
    * @param count
    * @param uid
    * @return
    */
   List<UserShareGoodsRecord> listQueryByUid(@Param("start") long start, @Param("count") int count, 
   List<UserShareGoodsRecord> listQueryByUid(@Param("start") long start, @Param("count") int count,
         @Param("uid") Long uid, @Param("source") String source);
	

   long countQueryByUid(@Param("uid") Long uid, @Param("source") String source);
	

   /**
    * 统计记录
    * 
    * @param list
    * @return
    */
   List<UserShareGoodsRecord> listCountRecord(@Param("list") List<Long> list);
	

   /**
    * 统计今日浏览记录
    * 
    * @param list
    * @return
    */
   List<UserShareGoodsRecord> listCountTodayBrowse(@Param("list") List<Long> list);
	

}