From 2ef19aff2a07ec697c1f1c672fbb2bf82cafacc0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 17 Aug 2024 18:21:27 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/assets/images/index.js | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/assets/images/index.js b/gz-customerSystem/src/assets/images/index.js
index 3e6047c..1d1ecfe 100644
--- a/gz-customerSystem/src/assets/images/index.js
+++ b/gz-customerSystem/src/assets/images/index.js
@@ -41,6 +41,7 @@
import applyMaterials_active from './applyMaterials_active.png';
import evidenceMaterials from './evidenceMaterials.png';
import evidenceMaterials_active from './evidenceMaterials_active.png';
+import closeIcon from './closeIcon.png';
export {
ledger_1,
@@ -76,5 +77,6 @@
applyMaterials,
applyMaterials_active,
evidenceMaterials,
- evidenceMaterials_active
+ evidenceMaterials_active,
+ closeIcon
};
--
Gitblit v1.8.0