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

admin

2019-10-29 54ae34b91644b02c422b41197ae6ce33f4e3ca57

 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);
   

}