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

yujian

2019-05-08 5e88359d7210039a6b1525bd5ffc20f24f2b5e01

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

@@ -151,4 +151,16 @@
         }

      }

   }

	
	
   @Override

   public List<CommonGoods> listBySellerId(Long sellerId) {

      return commonGoodsMapper.listBySellerId(sellerId);

   } 
	
	
   @Override

   public long countBySellerIdAndHasCoupon(Long sellerId) {

      return commonGoodsMapper.countBySellerIdAndHasCoupon(sellerId);

   }

}