Merge branch 'mater-1.6.0' into div

admin

2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2

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

}