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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/web/Model/Model.csproj b/web/Model/Model.csproj
index 3f53208..33dbb38 100644
--- a/web/Model/Model.csproj
+++ b/web/Model/Model.csproj
@@ -64,9 +64,11 @@
<Compile Include="Model\GwClientCertification.cs" />
<Compile Include="Model\GwClientPayLog.cs" />
<Compile Include="Model\GwClientPayMent.cs" />
+ <Compile Include="Model\GwClientProduct.cs" />
<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" />
@@ -76,10 +78,15 @@
<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" />
- <Compile Include="PageBase.cs" />
+ <Compile Include="MasterPageBase.cs">
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="PageBase.cs">
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
<Compile Include="Model\GwAp.cs" />
<Compile Include="Model\SysMenu.cs" />
<Compile Include="Model\SysUserMenu.cs" />
--
Gitblit v1.9.1