diff options
| author | Roy <roy.mail.net@gmail.com> | 2017-12-26 21:16:15 +0200 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2017-12-26 21:16:15 +0200 |
| commit | 2ea2bb5bcd96045f1bd6cb4c3d8b8416dbaa05dc (patch) | |
| tree | a21ff27fff08876e835df82c5242def1f0d09c17 /Software/Visual_Studio/Tango.DAL.Local | |
| parent | 6450fc175114a6f8d0b75cb21386d1bb0c902711 (diff) | |
| download | Tango-2ea2bb5bcd96045f1bd6cb4c3d8b8416dbaa05dc.tar.gz Tango-2ea2bb5bcd96045f1bd6cb4c3d8b8416dbaa05dc.zip | |
MERGE
Diffstat (limited to 'Software/Visual_Studio/Tango.DAL.Local')
| -rw-r--r-- | Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx | 3 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx index aa2095368..4bd90ccea 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx @@ -393,6 +393,7 @@ <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" /> <Property Name="DELETED" Type="bit" Nullable="false" /> + <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="MANUFACTURER" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="MATERIAL_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> <Property Name="COLOR_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" /> @@ -942,6 +943,7 @@ <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" /> <Property Name="DELETED" Type="Boolean" Nullable="false" /> + <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="MANUFACTURER" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="MATERIAL_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> <Property Name="COLOR_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" /> @@ -1457,6 +1459,7 @@ <ScalarProperty Name="COLOR_GUID" ColumnName="COLOR_GUID" /> <ScalarProperty Name="MATERIAL_GUID" ColumnName="MATERIAL_GUID" /> <ScalarProperty Name="MANUFACTURER" ColumnName="MANUFACTURER" /> + <ScalarProperty Name="NAME" ColumnName="NAME" /> <ScalarProperty Name="DELETED" ColumnName="DELETED" /> <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> <ScalarProperty Name="GUID" ColumnName="GUID" /> diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs index 8b7723d95..d84850194 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs @@ -18,6 +18,7 @@ namespace Tango.DAL.Local.DB public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } public bool DELETED { get; set; } + public string NAME { get; set; } public string MANUFACTURER { get; set; } public string MATERIAL_GUID { get; set; } public string COLOR_GUID { get; set; } |