From a46339e796fc2ee56959618cf1a7ce0382c1c74c Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期六, 09 十月 2021 14:44:16 +0800
Subject: [PATCH] Merge branch 'Develop' into Dev_yzh

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

diff --git a/web/Model/Model.csproj b/web/Model/Model.csproj
index 3f53208..0263a6d 100644
--- a/web/Model/Model.csproj
+++ b/web/Model/Model.csproj
@@ -67,6 +67,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" />
@@ -76,10 +77,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