Merge branch 'master' of http://gitlab.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Server/Apis/Siger.ApiACC/Controllers/FixtureToolsController.cs

@@ -179,9 +179,9 @@ namespace Siger.ApiACC.Controllers
 
 
         [HttpGet]
-        public IActionResult GetCategoryPageList(int id, int page, int pagesize)
+        public IActionResult GetCategoryPageList(string id, int page, int pagesize)
         {
-            var data = _toolsCategoryRepository.GetPagedList(id, ProjectId, page, pagesize);
+            var data = _toolsCategoryRepository.GetPagedList(id.ToInt(), ProjectId, page, pagesize);
             return new PagedObjectResult(data.Data, data.Total, page, pagesize);
         }