Merge branch 'master' into dev

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

@@ -1065,6 +1065,7 @@ class TaskPartnerProfits
         }
 
         $salesArr = $dividendLogEntity->getResult();
+        $salesArr = is_array($salesArr) ?: json_decode($salesArr, true);
         foreach ($salesArr as $key => $value) {
             if (empty($value)) {
                 continue;