From ee15dec5d91adbd1bdf15b26915b79751c17e481 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 09:39:17 +0800
Subject: [PATCH] 解决冲突

---
 web/Model/Model.csproj |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/web/Model/Model.csproj b/web/Model/Model.csproj
index 3136973..33dbb38 100644
--- a/web/Model/Model.csproj
+++ b/web/Model/Model.csproj
@@ -68,6 +68,7 @@
     <Compile Include="Model\GwMobileArea.cs" />
     <Compile Include="Model\GwMoRoute.cs" />
     <Compile Include="Model\GwOpGroupItem.cs" />
+    <Compile Include="Model\GwProduct.cs" />
     <Compile Include="Model\GwRmResend.cs" />
     <Compile Include="Model\GwSmsTask.cs" />
     <Compile Include="Model\GwStatisV3.cs" />
@@ -77,6 +78,7 @@
     <Compile Include="Model\LgSmsTask.cs" />
     <Compile Include="Model\MessageCenter.cs" />
     <Compile Include="Model\SysOperationLog.cs" />
+    <Compile Include="Model\SysXh.cs" />
     <Compile Include="PageHandler.cs" />
     <Compile Include="PageContext.cs" />
     <Compile Include="MasterPageBase.cs">

--
Gitblit v1.9.1