Merge branch 'develop' of http://git.huaperfect.com/without_auth/meibuyu-rpc into develop

# Conflicts:
#	src/Service/Interfaces/User/BaseInfoServiceInterface.php

src/Service/Interfaces/SyncDataService/SyncMagentoServiceInterface.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: qiudongfang
+ * Date: ${DATA}
+ * Time: 下午2:57
+ */
+
+namespace Meibuyu\Rpc\Service\Interfaces\SyncDataService;
+
+interface SyncMagentoServiceInterface
+{
+    /**
+     * @param $platformOrderId 平台单号id
+     * @param int $pageSize 每页最多展示50条
+     * @return array
+     */
+    public function syncOrders($platformOrderId, $pageSize = 10):array;
+}

src/Service/Interfaces/User/BaseInfoServiceInterface.php

@@ -241,15 +241,6 @@ interface BaseInfoServiceInterface
      */
     public function getCountriesByCodes(array $codes, array $columns = ['*'], $codeType = 2);
 
-    /**
-     * 根据国家地区code数组获取国家地区数组
-     * @param array $codes 国家code数组
-     * @param null $countryId 国家id
-     * @param array $relations 关联关系,默认空 可填['country']
-     * @return array
-     * @author Zero
-     */
-    public function getCountryZonesByCodes(array $codes, $countryId = null, array $relations = []);
 
     /**
      * 通过角色标识获取角色信息
@@ -261,5 +252,4 @@ interface BaseInfoServiceInterface
      * @return array|null
      */
     public function getRoleByName(string $name, array $relations = [], array $columns = ['*']);
-
 }