Merge branch 'dev' of http://gitlab.dvgd.oao.rzd/devptk/parr/parr_api into dev

# Conflicts: # PARR.TemplateDistributor/TemplateDistributor.cs
2024-07-05 15:21:06 +10:00
parent 21a175d197 65963419f7
commit a489ad4990
28 changed files with 462 additions and 81 deletions
--- a/PARR.TemplateDistributor/TemplateDistributor.cs
+++ b/PARR.TemplateDistributor/TemplateDistributor.cs
@@ -86,9 +86,7 @@ namespace PARR.TemplateDistributor
        }


-
        public async Task<List<Template>> DistributeTemplateAsync(List<Template> templates, Guid applicationInWorkId, Guid workGroupid)
-        //public async Task<List<Template>> DistributeTemplateAsync(List<Template> templates, Guid applicationInWorkId)
        {
            //TODO: ЗАГУЛШКА переделать!