Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-03-17 0bcfecbfb194ab908fc33dee9cae43c7a77b608d

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WxShopCouponService.java

@@ -18,7 +18,7 @@
    * 根据购物车选中的产品
    * @return
    */
   public List<CouponReceiveInfoVO> getCartVoCouponList(Long shopId,List<ShopShoppingCart> shopShoppingCarts);
   public List<CouponReceiveInfoVO> getCartVoCouponList(Long companyId,List<ShopShoppingCart> shopShoppingCarts);


   /**