Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

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

   }

}