Merge remote-tracking branch 'origin/master'

admin

2019-05-23 df46ce4fadd17170e33cc9e350ea6645f1f4c849

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

@@ -68,4 +68,11 @@
    */
   int getMaxWeightByPid(@Param("pid") Long pid);
   
   /**
    * 一级id查询
    * @param list
    * @return
    */
   List<GoodsSubClass> queryByListCid(List<Long> list);
	
}