From 4e4227f9d9b0c7efc4e4afd2bb371bae9fe6cc03 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 10:11:10 +0800
Subject: [PATCH] 修复代理商资料无法修改问题与合并以往修改操作

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

diff --git a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
index c81c0a4..2520360 100644
--- a/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Release/Model.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
-c4762145da2a34560c5dc93e2958bfb07137e5f2
-=======
-4680df9d251d534abbe2f1eb51d69736b996d0d8
->>>>>>> Stashed changes
+db450e1efa71a4dea326f082acc3fcb64ed72125

--
Gitblit v1.9.1