Merge branch 'version1.5' into 流程及操作节点

app/admin/controller/Consult.php

@@ -527,6 +527,7 @@ class Consult extends Base
                 "pgNo"=>$pgNo,
                 "use_desc"=>$use_desc,
                 "remark"=>$remark,
+                "bargain_num"=>$zxinfo['bargain_num']+1,
                 "status"=>1,
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),

app/admin/controller/Goodup.php

@@ -1043,7 +1043,7 @@ class Goodup extends Base
                 ]);
                 $data=[
                     "code"=>$supcode,
-                    "exam_status"=>$online['exam_status'],//$status,
+                    "exam_status"=>$status,
                     "type"=>1,
                     "exam_id"=>$createrid,
                     "exam_name"=>$creater,