Merge branch 'div1'

yujian

2019-01-08 a79be5c75d4409bd14a36b648c1a398b409cad65

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/goods/CommonGoodsMapper.java

@@ -2,7 +2,7 @@

import org.apache.ibatis.annotations.Param;

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

public interface CommonGoodsMapper {