From 5944b55b1486943c696a3beb004d564dceb81cf2 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 01 三月 2022 20:43:48 +0800
Subject: [PATCH] 待审核新增按通道查询

---
 web/web/Bin/Release/Publish/bin/error.aspx.cdcab7d2.compiled |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/web/web/Bin/Release/Publish/bin/error.aspx.cdcab7d2.compiled b/web/web/Bin/Release/Publish/bin/error.aspx.cdcab7d2.compiled
index fc79925..de20629 100644
--- a/web/web/Bin/Release/Publish/bin/error.aspx.cdcab7d2.compiled
+++ b/web/web/Bin/Release/Publish/bin/error.aspx.cdcab7d2.compiled
@@ -1,5 +1,9 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< Updated upstream
 <preserve resultType="3" virtualPath="/web/Error.aspx" hash="fffffff0f8c188f4" filehash="821a1ec5afbea06d" flags="110000" assembly="App_Web_oibi53em" type="ASP.error_aspx">
+=======
+<preserve resultType="3" virtualPath="/web/Error.aspx" hash="fffffff0f8c188f4" filehash="3ab940e557f2526a" flags="110000" assembly="App_Web_fx5xac0k" type="ASP.error_aspx">
+>>>>>>> Stashed changes
     <filedeps>
         <filedep name="/web/Error.aspx" />
         <filedep name="/web/Error.aspx.cs" />

--
Gitblit v1.9.1