diff --git a/SecuritySystem/FormManufacture.resx b/SecuritySystem/FormManufacture.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SecuritySystem/FormManufacture.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SecuritySystem/FormManufactureComponent.resx b/SecuritySystem/FormManufactureComponent.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SecuritySystem/FormManufactureComponent.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SecuritySystemContracts/SearchModels/ManufactureSearchModel.cs b/SecuritySystemContracts/SearchModels/ManufactureSearchModel.cs new file mode 100644 index 0000000..2613f72 --- /dev/null +++ b/SecuritySystemContracts/SearchModels/ManufactureSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SecuritySystemContracts.SearchModels +{ + public class ManufactureSearchModel + { + public int? Id { get; set; } + public string? ManufactureName { get; set; } + } +} diff --git a/SecuritySystemContracts/SearchModels/SecureSearchModel.cs b/SecuritySystemContracts/SearchModels/SecureSearchModel.cs index ea906d3..1778cfb 100644 --- a/SecuritySystemContracts/SearchModels/SecureSearchModel.cs +++ b/SecuritySystemContracts/SearchModels/SecureSearchModel.cs @@ -6,9 +6,16 @@ using System.Threading.Tasks; namespace SecuritySystemContracts.SearchModels { +<<<<<<< HEAD:SecuritySystemContracts/SearchModels/ComponentSearchModel.cs + public class ComponentSearchModel + { + public int? Id { get; set; } + public string? ComponentName { get; set; } +======= public class SecureSearchModel { public int? Id { get; set; } public string? SecureName { get; set; } +>>>>>>> Rename:SecuritySystemContracts/SearchModels/SecureSearchModel.cs } }