Merge remote-tracking branch 'origin/div' into div

admin

2019-09-24 3f042f2d3ce9bae01678c8e57425f71d774eaad5

 fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java

@@ -19,8 +19,8 @@
import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.exception.jd.JDGoodsException;

import com.yeshi.fanli.service.inter.config.ConfigService;

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

import com.yeshi.fanli.service.inter.jd.JDGoodsService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;