sunyu::update::resolve conflicts

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -97,6 +97,17 @@ public interface ShoppingCartBaseService {
      */
     BaseResponse clear(CartParamDto cartParamDto, String trackingNo);
 
+
+    /**
+     * 获取购物车商品代金券
+     *
+     * @param cartParamDto
+     * @return
+     */
+    default BaseResponse<String> getCartCouponCode(CartParamDto cartParamDto, String trackingNo) {
+        return null;
+    }
+
     /**
      * 获取商品详细信息
      *