Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

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

@@ -4,7 +4,7 @@

import org.apache.ibatis.annotations.Param;

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

public interface CollectionGoodsV2Mapper {