This commit is contained in:
2025-02-25 16:41:38 +08:00
40 changed files with 280 additions and 1 deletions
@@ -60,8 +60,11 @@ namespace BLL
newModel.Code = model.Code;
newModel.Name = model.Name;
newModel.Remark = model.Remark;
<<<<<<< HEAD
=======
newModel.CompileDate = model.CompileDate;
newModel.CompileMan = model.CompileMan;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
Funs.DB.SubmitChanges();
}
}
@@ -1,8 +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
{
@@ -64,8 +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();
}
}
@@ -60,8 +60,11 @@ namespace BLL
newModel.Code = model.Code;
newModel.Name = model.Name;
newModel.Remark = model.Remark;
<<<<<<< HEAD
=======
newModel.CompileDate = model.CompileDate;
newModel.CompileMan = model.CompileMan;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
Funs.DB.SubmitChanges();
}
}
@@ -50,8 +50,11 @@ namespace BLL
newModel.Code = model.Code;
newModel.Name = model.Name;
newModel.Remark = model.Remark;
<<<<<<< HEAD
=======
newModel.CompileDate = model.CompileDate;
newModel.CompileMan = model.CompileMan;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
Funs.DB.SubmitChanges();
}
}
@@ -1,9 +1,24 @@
<<<<<<< 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;
using Microsoft.Office.Interop.Excel;
using RestSharp;
using System.Web.UI.WebControls;
using Microsoft.SqlServer.Dts.Runtime;
=======
using System.Web.UI.WebControls;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace BLL
{
@@ -60,8 +60,11 @@ namespace BLL
newModel.Code = model.Code;
newModel.Name = model.Name;
newModel.Remark = model.Remark;
<<<<<<< HEAD
=======
newModel.CompileDate = model.CompileDate;
newModel.CompileMan = model.CompileMan;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
Funs.DB.SubmitChanges();
}
}