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/alarmlog.ashx.cdcab7d2.compiled |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/web/web/Bin/Release/Publish/bin/alarmlog.ashx.cdcab7d2.compiled b/web/web/Bin/Release/Publish/bin/alarmlog.ashx.cdcab7d2.compiled
index 708b9e1..d02cb29 100644
--- a/web/web/Bin/Release/Publish/bin/alarmlog.ashx.cdcab7d2.compiled
+++ b/web/web/Bin/Release/Publish/bin/alarmlog.ashx.cdcab7d2.compiled
@@ -1,5 +1,9 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< Updated upstream
 <preserve resultType="2" virtualPath="/web/AlarmLog.ashx" hash="ffffffff89671860" filehash="1e43faa65743" flags="110000" assembly="App_Web_tlwmm4hc" type="AlarmLogHandler">
+=======
+<preserve resultType="2" virtualPath="/web/AlarmLog.ashx" hash="ffffffff89671860" filehash="ffffca0f5e7ea0f7" flags="110000" assembly="App_Web_p2jueioo" type="AlarmLogHandler">
+>>>>>>> Stashed changes
     <filedeps>
         <filedep name="/web/AlarmLog.ashx" />
     </filedeps>

--
Gitblit v1.9.1