From c19e349f8c93ff63b56fa550ab38d68d67c6905b Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 14 Aug 2024 11:29:49 +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 b48a107..152c30e 100644
--- a/gz-customerSystem/src/assets/images/index.js
+++ b/gz-customerSystem/src/assets/images/index.js
@@ -33,6 +33,7 @@
import del from './del.png';
import question from './question.png';
import question1 from './question1.png';
+import person from './person.png';
export {
ledger_1,
@@ -60,5 +61,6 @@
add,
del,
question,
- question1
+ question1,
+ person
};
--
Gitblit v1.8.0