Merge remote-tracking branch 'origin/master'

admin

2019-04-19 690361e16f3550cb659701fb30eea5a336292402

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java

@@ -6,9 +6,9 @@
import java.util.List;



import javax.annotation.Resource;

import javax.transaction.Transactional;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.push.PushGoodsMapper;

import com.yeshi.fanli.entity.goods.CommonGoods;