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 | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/assets/images/icon/index.js b/gz-customerSystem/src/assets/images/icon/index.js
index 8e9d79e..53dc372 100644
--- a/gz-customerSystem/src/assets/images/icon/index.js
+++ b/gz-customerSystem/src/assets/images/icon/index.js
@@ -143,6 +143,8 @@
//大厅来访
import scan from './scan.svg'
+import result from './result.svg'
+import escalation from './escalation.svg'
export {
mediationCenter,
@@ -267,5 +269,7 @@
registerChooseModal_3,
registerChooseModal_4,
qrCodeImg,
- scan
+ scan,
+ result,
+ escalation
};
--
Gitblit v1.8.0