Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Proorder.php

@@ -163,6 +163,7 @@ public function __construct(App $app)
                     ['a.roleid','in',$value['roleid']],
                     ['b.nickname','<>',''],
                     ['b.is_del', '=', 0],
+                    ['a.roleid', '<>', 1]//超级管理员不在这个范围内
                 ])->leftJoin('depart_user b','b.uid=a.uid')
                 ->column('b.nickname');