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

app/admin/controller/Goodup.php

@@ -122,7 +122,7 @@ class Goodup extends Base
             if($useinfo==false){
                 return error_show(1002,"未找到用户角色权限");
             }
-            $check = checkRole($useinfo['roleid'],688);
+            $check = checkRole($useinfo['roleid'],115);
             if($check){
                 $where[] .=['createrid', "=" ,$rm];
             }