Merge branch 'master' into wxw

wxw

2024-08-28 ec899ee7e9ead5152bd9b4c2dedd75c79cab6fb0

 Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs

@@ -144,7 +144,7 @@
        return await _wcsDeviceRep.Context.Queryable<WcsPlc>()
                .Select(u => new
                {
                    Label = u.IP,
                    Label = u.Text,
                    Value = u.Id
                }
                ).ToListAsync();