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

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

@@ -83,7 +83,7 @@ namespace Siger.ApiACC.Controllers
                  },
                  dts=result
             };
-            return new ObjectResult(result);
+            return new ObjectResult(output);
         }
         [HttpGet]
         public IActionResult GetTasklist(int section, int tasktype, string productCode, string taskno, string sn, int status, int actionType, string triggertime, string complatetime,int page,int pageSize)