1

2025-02-22 10:34:16 +08:00
parent 0c6a49306c 7396d1b654
commit 379ff372c5
63 changed files with 4416 additions and 3 deletions
@@ -1,12 +1,19 @@
+<<<<<<< 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
 {
@@ -68,6 +75,11 @@ 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();
            }
        }