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

diff --git a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
index 57e5d3c..a0578fb 100644
--- a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
 12e65c17b8944c912c6483c66ed2578caa57f1d2
+=======
+db450e1efa71a4dea326f082acc3fcb64ed72125
+>>>>>>> 7bd27b4c5967ffaa87e8a813687da7edb909148c

--
Gitblit v1.9.1