Merge branch 'master' into develop

app/Http/Controllers/UploadimgController.php

@@ -18,6 +18,7 @@ class UploadimgController extends Controller
     {
         if ($request->isMethod('post')) { //判断文件是否是 POST的方式上传
             $tmp = $request->file('file');
+            $alarm_order_id = $request->input('alarm_order_id');
             if (is_null($tmp)){
                 return $this->jsonErrorData(105,'上传图片不能为空');
             }
@@ -34,7 +35,8 @@ class UploadimgController extends Controller
                 $data = [
                     'code' => 200,
                     'imginfo' =>$tmp,
-                    'path' => $path . '/' . $FileName //文件路径
+                    'path' => $path . '/' . $FileName, //文件路径
+                    'alarm_order_id' =>$alarm_order_id
                 ];
                 return $this->adduserimg($data);
             }