Merge pull request '下载bug' (#397) from hotfix/remove_promote_package into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/397
master
廖金灵 3 years ago
commit 027a483aad

@ -220,7 +220,7 @@ class BusinessAffairsAwardController extends ThinkController
$data[$key]['verify_detail'] = '未审核'; $data[$key]['verify_detail'] = '未审核';
} }
$data[$key]['ratio'] = round(($value['month_award']/$value['pay_amount']*100),2)."%"; $data[$key]['ratio'] = round(($value['month_award']/$value['pay_amount']*100),2)."%";
$data[$key]['game_assistant_name'] = $value['game_assistant_name'] == '' ? '无' : $value['game_assistant_name'];
} }
if ($_REQUEST['export']) { if ($_REQUEST['export']) {
@ -233,7 +233,7 @@ class BusinessAffairsAwardController extends ThinkController
'game_bonus_pool' => '该产品奖金池', 'game_bonus_pool' => '该产品奖金池',
'month_award'=>'商务个人本月应得', 'month_award'=>'商务个人本月应得',
// '' => '助理', 'game_assistant_name' => '助理',
'assistant_month_award' => '助理本月应得', 'assistant_month_award' => '助理本月应得',
'department_award' => '部门累计', 'department_award' => '部门累计',
'person_award' => '个人激励', 'person_award' => '个人激励',

Loading…
Cancel
Save