Merge branch 'master' into div

yujian

2019-07-11 1510301f5673631ad24fb5634bff5d504eda5ccd

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

@@ -32,7 +32,7 @@
    * @param classId
    * @return
    */
   List<GoodsSubClassLabelVO> listSubMapByClassId(@Param("classId") Long classId);
   List<GoodsSubClassLabelVO> listSubMapByClassId(@Param("classId") Long classId,@Param("month")Integer month);
   

}