培训

SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs

@@ -1,19 +1,8 @@
-<<<<<<< HEAD
-using EmitMapper;
-using Microsoft.Office.Interop.Word;
-using MiniExcelLibs;
-=======
 using MiniExcelLibs;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using Model;
 using System.Collections.Generic;
 using System;
 using System.Linq;
-<<<<<<< HEAD
-using System.Runtime.CompilerServices;
-using Quartz.Util;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace BLL
 {
@@ -75,11 +64,8 @@ namespace BLL
                 newModel.Teachers1 = model.Teachers1;
                 newModel.Teachers2 = model.Teachers2;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }