Merge branch 'master' into api-dev

* master:
  1
  1

# Conflicts:
#	hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java

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;
     }

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);