Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/command/ImportOrderFromCHandleData.php

@@ -413,7 +413,7 @@ class ImportOrderFromCHandleData extends Command
                                 if ($ou == false) throw new Exception('发货地址添加创建失败');
                                 else {
                                 	    //修改状态，添加待办
-		                            $roleid = config('app.wsm_cgder_role');
+		                            $roleid = Config('app.wsm_cgder_role');
 		                            $uids = Db::name('user_role')
 		                                ->where('is_del', 0)
 		                                ->whereIn('roleid', $roleid)