Merge remote-tracking branch 'origin/master'

admin

2019-03-01 a5b74cb17159f71dac98b3e7ae81e43fce73a3f9

 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 {