From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BZLOCK/JCBZYLController.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BZLOCK/JCBZYLController.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BZLOCK/JCBZYLController.cs
index 4dcb06d..4848724 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BZLOCK/JCBZYLController.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BZLOCK/JCBZYLController.cs
@@ -2,13 +2,13 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Core;
-using WIDESEAWCS_Tasks.ConveyorLineJob_GW;
+using WIDESEAWCS_Tasks;
namespace WIDESEAWCS_Server.Controllers.BZLOCK
{
[Route("api/[controller]")]
[ApiController]
- public class JCBZYLController : ControllerBase
+ public class JCBZYLController : Controller
{
private readonly IGetStationService _getStationService;
public JCBZYLController(IGetStationService getStationService) { _getStationService = getStationService; }
--
Gitblit v1.9.3