Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel

application/services/marketing/ColonelService.php

@@ -128,7 +128,7 @@ class ColonelService
         foreach ($result['result'] as &$colonelVal) {
             $userId = $colonelVal['user_id'];
             $colonelVal['user_avatar'] = !empty($userMap[$userId]['user_avatar']) ? $userMap[$userId]['user_avatar'] : '';
-            $colonelVal['yesterday_income'] = !empty($incomeMap[$userId]['yesterday_reward']) ? $incomeMap[$userId]['yesterday_reward'] : 0;
+            $colonelVal['no_settlement_income'] = !empty($incomeMap[$userId]['no_settlement']) ? $incomeMap[$userId]['no_settlement'] : 0;
             $colonelVal['total_income'] = !empty($incomeMap[$userId]['all_reward']) ? $incomeMap[$userId]['all_reward'] : 0;
         }
         unset($colonelVal);