培训

SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs

@@ -1,11 +1,5 @@
 using BLL;
-<<<<<<< HEAD
-using Microsoft.Office.Interop.Excel;
 using System;
-using System.Web;
-=======
-using System;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {
@@ -167,11 +161,7 @@ namespace FineUIPro.Web.HSSE.PostTraining
             //newModel.RoleId = this.drpRole.SelectedValue;
             newModel.CourseId = this.drpCourse.SelectedValue;
             newModel.ClassHour = decimal.Parse(this.txtClassHour.Text.Trim());
-<<<<<<< HEAD
-            newModel.Cycle = int.Parse(this.txtCycle.Text.Trim());
-=======
             newModel.Cycle = decimal.Parse(this.txtCycle.Text.Trim());
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
             newModel.Method = this.drpMethod.SelectedText;
             newModel.Outcome = this.drpOutcome.SelectedText;
             newModel.Teachers = this.drpTeachers.SelectedText;