02aac296 by wang

Merge remote-tracking branch 'origin/develop' into develop

2 parents 40917502 0443605e
...@@ -305,6 +305,7 @@ class Work extends CI_Controller ...@@ -305,6 +305,7 @@ class Work extends CI_Controller
305 $result2 = file_get_contents($url2); 305 $result2 = file_get_contents($url2);
306 $json2 = json_decode($result2); 306 $json2 = json_decode($result2);
307 $ret2 = $json2->data; 307 $ret2 = $json2->data;
308 var_dump($ret2);exit;
308 309
309 $data = array( 310 $data = array(
310 'clientInfoOutputVO' => $ret->clientInfoOutputVO, 311 'clientInfoOutputVO' => $ret->clientInfoOutputVO,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!