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/Release/Dao.csproj.CoreCompileInputs.cache     |    4 ++++
 web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
index 3d2c5e5..21ddc74 100644
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1,5 +1,9 @@
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 03ac8fb778df47064b4ab65f28af8408156b7fa4
 =======
 4e3d3c0d46e0394eded6a28ceeaec6a8f69625db
 >>>>>>> Stashed changes
+=======
+03ac8fb778df47064b4ab65f28af8408156b7fa4
+>>>>>>> 751731362e5fcf901065c25eaed0319cf7a27cc1
diff --git a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
index c81c0a4..db7c352 100644
--- a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
@@ -1,5 +1,9 @@
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 c4762145da2a34560c5dc93e2958bfb07137e5f2
 =======
 4680df9d251d534abbe2f1eb51d69736b996d0d8
 >>>>>>> Stashed changes
+=======
+c4762145da2a34560c5dc93e2958bfb07137e5f2
+>>>>>>> 751731362e5fcf901065c25eaed0319cf7a27cc1

--
Gitblit v1.9.1