From a89e6ba4b31d13e437d04146490ba8f1c299da08 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 01 三月 2022 20:45:22 +0800
Subject: [PATCH] Merge branch 'Develop' of http://8.129.227.30:10801/r/SMGW_NewWeb into Develop

---
 web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
index ae28740..c0e4614 100644
--- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d5ec7438d89fe18e3bec35b6f500682586a1659d
-=======
-43d05d7d9c29e436978c39f631255cf56ad1e8a9
->>>>>>> remotes/origin/Release
+f49ea4d5ec2d8ff937394d4683aa2e9a9d5935d0

--
Gitblit v1.9.1