Merge remote-tracking branch 'origin/master'

admin

2019-04-22 f877016b46d8b76ef445a4ac337f8eae66b882be

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonGoodsServiceImpl.java

@@ -4,9 +4,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 org.yeshi.utils.StringUtil;



import com.yeshi.fanli.dao.mybatis.goods.CommonGoodsMapper;