Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz

master
chenzhi 5 years ago
commit aae3f73e38

@ -420,7 +420,7 @@ class TestResourceController extends BaseController
$data['apply_name']=$_SESSION['onethink_home']['promote_auth']['account']; $data['apply_name']=$_SESSION['onethink_home']['promote_auth']['account'];
$data['apply_id']=$_SESSION['onethink_home']['promote_auth']['pid']; $data['apply_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
$data['promote_id']=$_SESSION['onethink_home']['promote_auth']['account']; $data['promote_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
$data['promote_account']=$_SESSION['onethink_home']['promote_auth']['account']; $data['promote_account']=$_SESSION['onethink_home']['promote_auth']['account'];
$data['create_time']=time(); $data['create_time']=time();

Loading…
Cancel
Save