Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/Remove_autoinc_from_db

Browse Source
This commit is contained in:
Lucio Maranta
2018-10-04 17:19:41 +02:00
parent 1191750fe6 3239909610
commit f784af225c
106 changed files with 2232 additions and 1223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Model/DatabaseModels/NcFamilyModel.cs
+2 -2
View File
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using CMS_CORE_Library.Models;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using static CMS_CORE_Library.DataStructures;
namespace Step.Model.DatabaseModels
{
Step.Model/DatabaseModels/NcMagazinePositionModel.cs
+4 -2
View File
@@ -1,6 +1,8 @@
using System.ComponentModel.DataAnnotations;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using static CMS_CORE_Library.DataStructures;
using CMS_CORE_Library.Models;
using static CMS_CORE_Library.Models.NcMagazinePositionModel;
namespace Step.Model.DatabaseModels
{
Step.Model/DatabaseModels/NcShankModel.cs
+3 -2
View File
@@ -1,7 +1,8 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using static CMS_CORE_Library.DataStructures;
using CMS_CORE_Library.Models;
namespace Step.Model.DatabaseModels
{
Step.Model/DatabaseModels/NcToolModel.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
using CMS_CORE_Library.Models;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using static CMS_CORE_Library.DataStructures;
namespace Step.Model.DatabaseModels
{