From 31cd18fade9aa8191d52c0e10a9823c22867dcd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=85=E5=BF=B5?= <email@sample.com>
Date: Mon, 21 Jul 2025 18:02:48 +0800
Subject: [PATCH] Merge branch 'master' into feature/crm_pc

# Conflicts:
#	.gitignore
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8942a5e..00f057e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ dist
 dist-ssr
 *.local
 .cursorrules
-/src/types/components.d.ts
\ No newline at end of file
+src/types/components.d.ts
\ No newline at end of file