修改合并冲突

This commit is contained in:
zhougf committed 2024-04-17 12:00:53 +08:00
1 parent 502342b15f
commit 12e16e0c6c
10 files changed
+11 -111

No files matched your search

@@ -1,14 +1,10 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.ComponentModel.DataAnnotations;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
<<<<<<< HEAD
using WalkingTec.Mvvm.Core;
=======
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
namespace HHWMS.Web
@@ -25,11 +21,7 @@ namespace HHWMS.Web
}
public override void DoAdd()
<<<<<<< HEAD
{
=======
{
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
base.DoAdd();
}