From ee15dec5d91adbd1bdf15b26915b79751c17e481 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 09:39:17 +0800
Subject: [PATCH] 解决冲突
---
web/Dao/Dao.csproj | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/web/Dao/Dao.csproj b/web/Dao/Dao.csproj
index 3d78b9c..1ee91f7 100644
--- a/web/Dao/Dao.csproj
+++ b/web/Dao/Dao.csproj
@@ -75,8 +75,10 @@
<Compile Include="GwClientCertificationDao.cs" />
<Compile Include="GwClientPayLogDao.cs" />
<Compile Include="GwClientPayMentDao.cs" />
+ <Compile Include="GwClientProductDao.cs" />
<Compile Include="GwMobileAreaDao.cs" />
<Compile Include="GwMoRouteDao.cs" />
+ <Compile Include="GwProductDao.cs" />
<Compile Include="GwRmResendDao.cs" />
<Compile Include="GwSpPrePattern.cs" />
<Compile Include="GwSpPrePatternDao.cs" />
@@ -89,6 +91,7 @@
<Compile Include="GwSpDao.cs" />
<Compile Include="SpSignatureInfo.cs" />
<Compile Include="SysOperationLogDao.cs" />
+ <Compile Include="SysXhDao.cs" />
<Compile Include="UserDao.cs" />
<Compile Include="GwAlarmDao.cs" />
<Compile Include="GwAuditCacheDao.cs" />
--
Gitblit v1.9.1