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

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

@@ -86,7 +86,6 @@ public enum ResponseResult {
     SHOPPING_CART_COUPON_CAN_NOT_USE_THIS_SHOP("44020", "券不适用于该门店"),
     SHOPPING_CART_SEAT_EMPTY("44020", "键位为空"),
     SHOPPING_CART_COUPON_USED("44021", "优惠券已加入餐盘"),
-    SHOPPING_CART_PRODUCT_CAN_NOT_USE("44023", "商品不可用"),
     SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE("44022", "已加入同样优惠券，第二张暂不可用"),
     SHOPPING_CART_PRODUCT_CAN_NOT_USE("44023", "商品不可用"),
     SHOPPING_CART_COUPON_CAN_NOT_USE("44024", "商品券不可用"),