Merge branch 'feature/oa1215' into dev

master
tping 4 years ago
commit 5b19067211

@ -377,7 +377,7 @@ class FengHuoApi2Controller extends GetInfoBaseController{
}else{ }else{
$promoteInfo = M('promote','tab_') $promoteInfo = M('promote','tab_')
->field('account') ->field('account')
->where('id',$promoteId) ->where(['id' => $promoteId])
->find(); ->find();
$data[$k]['promote_id'] = $promoteId; $data[$k]['promote_id'] = $promoteId;
$data[$k]['promote_account'] = $promoteInfo['account']; $data[$k]['promote_account'] = $promoteInfo['account'];

Loading…
Cancel
Save