1 fix 合并冲突

assortment-ordercenter-sdk/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.11.RELEASE</version>
+            <version>1.4.32-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -83,6 +83,10 @@ public enum ResponseResult {
     SHOPPING_CART_SENDGOODS_NOT_EXIST("44011", "加价购商品不存在"),
     SHOPPING_CART_STOCK_NOT_HAVE("44012", "商品库存不足"),
     SHOPPING_CART_PRODUCT_NOT_EXIST("44013", "商品不存在"),
+    ORDER_TAKE_MEAL_TIME_ERROR("450062", "你的到店取餐时间异常，请重新选择！"),
+    ORDER_MEALTIME_MISSING("450063", "你的取餐方式或取餐时间异常，请重新选择!"),
+    ORDER_TAKE_OUT_TIME_ERROR("450062", "你的外卖送达时间异常，请重新选择！"),
+
 
     /**
      * 订单状态码