From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突

---
 gz-customerSystem/.gitignore |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gz-customerSystem/.gitignore b/gz-customerSystem/.gitignore
index 4d29575..e9e922d 100644
--- a/gz-customerSystem/.gitignore
+++ b/gz-customerSystem/.gitignore
@@ -21,3 +21,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+package-lock.json

--
Gitblit v1.8.0