Merge branch 'dev' of wugg/stock into master

app/admin/controller/Departuser.php

@@ -63,7 +63,7 @@ class Departuser extends BaseController
         $tid = Db::name('company_item')->where(['id'=>$itemid,'is_del'=>0])->find();
         //var_dump( Db::name('company_item')->getLastSql());
         if(empty($tid)){
-            return error_show(1004,"部门不能为空");
+            return error_show(1004,"部门不存在");
         }
        $status = isset($this->post['status']) && $this->post['status'] !==""? trim($this->post['status']) : "1";
         if($status==""){
@@ -121,7 +121,7 @@ class Departuser extends BaseController
             ];
             $r = Db::name("depart_user")->where(["is_del"=>0,"id"=>$id])->save($d);
            // var_dump( Db::name("depart_user")->getLastSql());
-            return  $r ? app_show(0,"信息更新成功",$to): error_show(1003,"信息更新失败");
+            return  $r ? app_show(0,"信息更新成功"): error_show(1003,"信息更新失败");
         }catch (\Exception $e){
             return error_show(1003,$e->getMessage());
         }