Merge remote-tracking branch 'origin/master'

admin

2019-03-13 f1fdf1aec9fb9f8f4d1220d4c8b3489b648ab59b

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java

@@ -292,4 +292,9 @@
      }

      goodsSubClassService.updateByPrimaryKeySelective(record);

   }

	
   @Override

   public List<GoodsSubClass> queryByListCid(List<Long> list){

      return goodsSubClassMapper.queryByListCid(list);

   }

}