From 49bb5b44654b325d5da87cd6491cb8f93f6121aa Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 15 Aug 2024 18:13:27 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/assets/images/index.js | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/gz-customerSystem/src/assets/images/index.js b/gz-customerSystem/src/assets/images/index.js
index e0a9158..3e6047c 100644
--- a/gz-customerSystem/src/assets/images/index.js
+++ b/gz-customerSystem/src/assets/images/index.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: lwh
* @Date: 2023-04-24 16:12:00
- * @LastEditTime: 2024-08-14 10:28:30
+ * @LastEditTime: 2024-08-15 14:37:33
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description:
@@ -36,7 +36,11 @@
import person from "./person.png";
import link from "./link.png";
import check from "./check.png";
-import image from './image.png'
+import image from './image.png';
+import applyMaterials from './applyMaterials.png';
+import applyMaterials_active from './applyMaterials_active.png';
+import evidenceMaterials from './evidenceMaterials.png';
+import evidenceMaterials_active from './evidenceMaterials_active.png';
export {
ledger_1,
@@ -68,5 +72,9 @@
person,
link,
check,
- image
+ image,
+ applyMaterials,
+ applyMaterials_active,
+ evidenceMaterials,
+ evidenceMaterials_active
};
--
Gitblit v1.8.0