Merge branch 'master' into 'sprint/191_zhouxin_54352'

# Conflicts: # module/datatable/config.php
2022-05-19 03:18:24 +00:00
parent f08ea8b043 aa81ba0c65
commit 6f150a9ea8
52 changed files with 528 additions and 158 deletions
@@ -348,7 +348,7 @@ if(!window.kanbanDropRules)
            'wait': ['wait', 'developing', 'developed', 'canceled'],
            'developing': ['developing', 'developed', 'pause', 'canceled'],
            'developed': ['developed', 'developing', 'closed'],
-            'pause': ['pause', 'developing', 'developed', 'canceled'],
+            'pause': ['pause', 'developing', 'canceled'],
            'canceled': ['canceled', 'developing', 'closed'],
            'closed': ['closed', 'developing'],
        }