* Adjust the block module language file and model.php Logic.

2020-11-19 14:07:58 +08:00
parent f2c6dba226
commit 72a2b18c20
7 changed files with 274 additions and 229 deletions
@@ -1271,7 +1271,11 @@ class projectModel extends model
    }

    /**
+<<<<<<< Updated upstream
     * Get ordered executions.
+=======
+     * Get ordered execution.
+>>>>>>> Stashed changes
     *
     * @param  int    $projectID
     * @param  string $status