From c47ecf1cfc7702b727eb74bc87a171816b3488b2 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 06 五月 2022 17:40:26 +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..57e5d3c 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
+12e65c17b8944c912c6483c66ed2578caa57f1d2

--
Gitblit v1.9.1