合并分支 'wangxiaogang' 到 'master'

debug



查看合并请求 !88

@@ -140,7 +140,7 @@ class OrderSalesmanController extends WeChatBaseController
             $arr['logistic_code'] = $param['logistic_code'];
         }
         $arr['state'] = 5;
-        $result = $indentModel->updateData($where,$arr);//
+        $result = $indentModel->updateData($where,$arr);////
         $this->success('发货成功');
     }
     public function send_all(){