Merge branch 'master' into test

UPGRADE_2.x.md

+# 2.0.78
+- 修改方法：getCraftsmenByUnionId
+
+# 2.0.77
+- 修改托管数据
+
+# 2.0.76
+- 添加删除店员的方法
+
 # 2.0.75
 - 外卖功能上线
 

src/Craftsman/Lib/CraftsmanInterface.php

@@ -17,7 +17,6 @@ use Swoft\Core\ResultInterface;
  * The interface of craftsman service
  *
  * @method ResultInterface deferGetCraftsmenList(int $storeId, int $subStoreId = 0, int $itemId = 0)
- * @method ResultInterface deferGetCraftsmenByUnionId(string $unionId, int $isSeller=0)
  * @method ResultInterface defercreateCraftsman($storeId, array $params)
  * @method ResultInterface deferGetCraftsmenById(int $storeId, int $cmanId)
  * @method ResultInterface deferGetCraftsmenByIds(int $storeId, array $cmanIds)
@@ -75,9 +74,10 @@ interface CraftsmanInterface
      *
      * @param string $unionId
      * @param int $isSeller   是否店主 1-是 ，0-否 
+     * @param int $cmanType   店员类型 0代表所有类型，参加枚举类：CmanEnum
      * @return array
      */
-    public function getCraftsmenByUnionId(string $unionId, int $isSeller =0);
+    public function getCraftsmenByUnionId(string $unionId, int $isSeller=0, int $cmanType=0);
 
     /**
      * 获取该店铺下的卖家身份的店员

src/Wx3rd/Lib/EntrustedInterface.php

@@ -91,4 +91,13 @@ interface EntrustedInterface
      */
     public function getMicroMchData(int $storeId);
 
+    /**
+     * 修改托管数据
+     *
+     * @param integer $storeId
+     * @param array $data
+     * @return int
+     */
+    public function updateEntrustedData(int $storeId, array $data);
+
 }
\ No newline at end of file