Merge branch 'mater-1.6.0' into div

admin

2019-08-23 91526d285399c7bf93588b6be910c3b849cab7e3

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java

@@ -23,8 +23,6 @@
import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;

import com.yeshi.fanli.util.Constant;