Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-08 5e88359d7210039a6b1525bd5ffc20f24f2b5e01

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