From 59c9c97c0830c285ff0bcd4f51e0d9de916057ee 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 17:56:52 +0800
Subject: [PATCH] Merge branch 'master' into feature/crm_pc

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

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