Merge remote-tracking branch 'origin/div' into div

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/CommonGoodsService.java

@@ -92,4 +92,12 @@
    */

   public List<CommonGoods> getByListGoodsId(List<Long> list, Integer goodsType);





   /**

    * 获取商品

    * @param id

    * @return

    */

   public CommonGoods selectByPrimaryKey(Long id);



}