Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-21 299e3b3ae10786a5b00124333a3e732009f83295

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSubClassMapper.java

@@ -26,7 +26,7 @@
    * @param rootId  一级id
    * @returnL
    */
   List<GoodsSubClass> queryByRootId(@Param("rootId") Long rootId, @Param("state") Integer state);
   List<GoodsSubClass> queryByRootId(@Param("rootId") Long rootId, @Param("state") Integer state,@Param("month") Integer month);
   
   /**
    *  查询二级分类之下其他分类