From c47ecf1cfc7702b727eb74bc87a171816b3488b2 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期五, 06 五月 2022 17:40:26 +0800
Subject: [PATCH] 订单审核

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

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

--
Gitblit v1.9.1