培训

2025-02-25 16:46:09 +08:00
parent 9a1dae2f31
commit 1c5146a776
40 changed files with 1 additions and 280 deletions
@@ -60,11 +60,8 @@ 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();
            }
        }