diff --git a/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java
index 917d30c3..7f7c9561 100644
--- a/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java
@@ -394,7 +394,11 @@ public class ApiProductServiceImpl implements ApiProductService {
         List<ApiKfcStores> apiKfcStores = apiKfcStoresMapper.selectByExample(example);
 
         if (apiKfcStores.size() > 0) {
+<<<<<<< HEAD
            return apiKfcStores.get(0);
+=======
+            return apiKfcStores.get(0);
+>>>>>>> master
         }
         return null;
     }
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
index 53ecbe0a..009c756f 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
@@ -2297,7 +2297,7 @@ public class HighOrderServiceImpl implements HighOrderService {
         updateOrder(order);
 
         HighGasOrderPush orderPush = new HighGasOrderPush();
-        JSONObject returnObject = new JSONObject();
+        JSONObject returnObject;
 
         for (HighChildOrder childOrder : order.getHighChildOrderList()) {
             childOrder.setChildOrdeStatus(2);