From 65c8026eaeff3d769a1d168933e13035708233e0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 10:00:48 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/assets/images/icon/index.js | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/assets/images/icon/index.js b/gz-customerSystem/src/assets/images/icon/index.js
index e27920d..53dc372 100644
--- a/gz-customerSystem/src/assets/images/icon/index.js
+++ b/gz-customerSystem/src/assets/images/icon/index.js
@@ -144,6 +144,7 @@
//大厅来访
import scan from './scan.svg'
import result from './result.svg'
+import escalation from './escalation.svg'
export {
mediationCenter,
@@ -269,5 +270,6 @@
registerChooseModal_4,
qrCodeImg,
scan,
- result
+ result,
+ escalation
};
--
Gitblit v1.8.0