From c4c5880d64a6c6fcbd8947c320bf8547eec9ef97 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 21:11:53 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/assets/images/index.js | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/assets/images/index.js b/gz-customerSystem/src/assets/images/index.js
index 72641cb..3d5fb35 100644
--- a/gz-customerSystem/src/assets/images/index.js
+++ b/gz-customerSystem/src/assets/images/index.js
@@ -56,6 +56,8 @@
import tip from "./tip.png";
import apply from "./apply.png";
import examine from "./examine.png";
+import knock from "./knock.png";
+import edit from "./edit.png";
export {
ledger_1,
@@ -106,5 +108,7 @@
down,
tip,
apply,
- examine
+ examine,
+ knock,
+ edit
};
\ No newline at end of file
--
Gitblit v1.8.0