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

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java

@@ -30,7 +30,7 @@
import com.yeshi.fanli.exception.user.UserGoodsStorageException;

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

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

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

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

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

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

import com.yeshi.fanli.util.CommonGoodsUtil;