Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

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

@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.inter.user;



import java.util.List;

import java.util.Map;



import net.sf.json.JSONObject;



@@ -17,8 +18,6 @@


   public int updateByPrimaryKeySelective(UserShareGoodsRecord record);



   public int updateByPrimaryKey(UserShareGoodsRecord record);

	
   public UserShareGoodsRecord selectByPrimaryKey(Long id);

   

   /**

@@ -59,7 +58,7 @@
    * @param listGoods 商品集合

    * @throws UserShareGoodsRecordException

    */

   public JSONObject save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods)

   public Map<String,Object> save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods)

         throws UserShareGoodsRecordException;



   /**