Merge remote-tracking branch 'origin/div' into div

admin

2019-10-21 45a24d7a84aa4f7d43fd2101ec4aac96b8c96f97

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/clazz/GoodsSubClassLabelMapper.java

@@ -6,6 +6,7 @@

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.bus.clazz.GoodsSubClassLabel;
import com.yeshi.fanli.vo.goods.GoodsSubClassLabelVO;

public interface GoodsSubClassLabelMapper extends BaseMapper<GoodsSubClassLabel> {

@@ -24,5 +25,14 @@
    * @return
    */
   List<GoodsSubClassLabel> listByClassId(@Param("classId") Long classId);
	
	
   /**
    * 查询二级分类、标签
    * @param classId
    * @return
    */
   List<GoodsSubClassLabelVO> listSubMapByClassId(@Param("classId") Long classId,@Param("month")Integer month);
	

}