sunyu::fix conflicts::resolve conflicts about merge branch

shopping-cart-application-service/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-shoppingcart-sdk</artifactId>
-            <version>1.1.5.RELEASE</version>
+            <version>1.9.11-SNAPSHOT</version>
         </dependency>
         <!--   再来一单查询订单信息  -->
         <dependency>

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -87,7 +87,8 @@ public enum ResponseResult {
     SHOPPING_CART_SEAT_EMPTY("44020", "键位为空"),
     SHOPPING_CART_COUPON_USED("44021", "优惠券已加入餐盘"),
     SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE("44022", "已加入同样优惠券，第二张暂不可用"),
-
+    SHOPPING_CART_PRODUCT_CAN_NOT_USE("44023", "商品不可用"),
+    SHOPPING_CART_COUPON_CAN_NOT_USE("44024", "商品券不可用"),
     /**
      * 订单状态码
      */