Merge branch 'master' into 'liyuchun_59437'

# Conflicts: # module/repo/control.php
2022-07-05 09:20:43 +00:00
parent 8a3d924e2b 109e977776
commit d175ae0f5e
145 changed files with 2133 additions and 411 deletions
@@ -2496,6 +2496,7 @@ EOD;
            if($module == 'company' and $method == 'dynamic') return true;
            if($module == 'action' and $method == 'editcomment') return true;
            if($module == 'action' and $method == 'comment') return true;
+            if($module == 'report' and $method == 'export') return true;
            if(!isset($acls['views'][$menu])) return false;

            return true;