Merge branch 'api' into hive2.0

Helius

2021-03-30 f7bfb2fad02329213b3264f146172ed0b2f3e8a3

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


   /**