Merge remote-tracking branch 'origin/master'

admin

2019-07-09 b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb

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

@@ -10,6 +10,13 @@
   List<TaoBaoClassRelation> listByTaoBaoCid(Long taobaoCid);

   /**
    * 根据淘宝分类id查询系统分类
    * @param taobaoCid
    * @return
    */
   Long getClassIdByTaoBaoCid(Long taobaoCid);
	
   /**
    * 根据分类id查询
    * 
    * @param taobaoCid