解决冲突

wxw

2024-08-30 d9e59ed2e947aff29b7c21a9b0e8b6e12d741692

 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs

@@ -14,7 +14,7 @@

    private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
    private static readonly SysCacheService sysCacheService = App.GetRequiredService<SysCacheService>();
    private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext;
    private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext = App.GetService<IHubContext<PlcHub, IPlcHub>>();

    private static List<WcsPlc> listPlc;
    private static List<WcsDevice> listPlcDevice;