Merge branch 'master' into dev

app/controller/api/store/merchant/TaskPartnerProfits.php

@@ -128,7 +128,7 @@ class TaskPartnerProfits
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
 
-        $zeroLineUidList = [1420, 2328, 1720];
+        $zeroLineUidList = [1420, 2328, 1720, 3];
         foreach ($zeroLineUidList as $uid) {
 
             //查询当前团队的用户列表