Merge remote-tracking branch 'origin/master'

admin

2019-05-15 7b9a96b619c3da31011e0dc555ffd7362621d701

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