From d4da5a8fe9dfaa361a98acb14fcd3e9ae00d1689 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 06 五月 2022 17:49:28 +0800
Subject: [PATCH] Merge branch 'Develop' of http://8.129.227.30:10801/r/SMGW_NewWeb into Develop

---
 web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
index 3d2c5e5..2fa7cbb 100644
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1,5 +1,5 @@
-<<<<<<< Updated upstream
-03ac8fb778df47064b4ab65f28af8408156b7fa4
+<<<<<<< HEAD
+0c60e0363c7ebe19e617b065424b04ecbc8fd3d6
 =======
-4e3d3c0d46e0394eded6a28ceeaec6a8f69625db
->>>>>>> Stashed changes
+ffceac74583ffe022717b2538e55c4e28b8e84c0
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c

--
Gitblit v1.9.1